Changeset 6962020b256671f0d54793afbbd2e63d7a0e5d0b

Timestamp:

28/03/08 16:45:15 (7 months ago)

Author:

Pierre d'Herbemont <pdherbemont@videolan.org>

git-committer:

Pierre d'Herbemont <pdherbemont@videolan.org> 1206719115 +0100

git-parent:

[242a2d12ffc267fae04a03d42d2b045cf5b2b441]

git-author:

Pierre d'Herbemont <pdherbemont@videolan.org> 1206718967 +0100

Message:

module: Make sure we can escape ':' correctly.

Files:

• src/modules/modules.c (modified) (4 diffs)

src/modules/modules.c

@@ -907 +907 @@
- *****************************************************************************/
-
+ /*****************************************************************************
+ * copy_next_paths_token: from a PATH_SEP_CHAR (a ':' or a ';') separated paths
+ * return first path.
+ *****************************************************************************/
+static char * copy_next_paths_token( char * paths, char ** remaining_paths )
+{
+    char * path;
+    int i;
+    bool escaped = false;
+
+    assert( paths );
+
+    /* Alloc a buffer to store the path */
+    path = malloc( strlen( paths ) );
+    if( !path ) return NULL;
+
+    /* Look for PATH_SEP_CHAR (a ':' or a ';') */
+    for( i = 0; paths[i]; i++ ) {
+        /* Take care of \\ and \: or \; escapement */
+        if( escaped ) {
+            escaped = false;
+            path[i] = paths[i];
+        }
+        else if( paths[i] == '\\' )
+            escaped = true;
+        else if( paths[i] == PATH_SEP_CHAR )
+            break;
+        else
+            path[i] = paths[i];
+    }
+
+    /* Return the remaining paths */
+    if( remaining_paths ) {
+        *remaining_paths = paths[i] ? &paths[i]+1 : NULL;
+    }
+
+    return path;
+}
+
-/*****************************************************************************
- * AllocateAllPlugins: load all plugin modules we can find.
@@ -913 +952 @@
-static void AllocateAllPlugins( vlc_object_t *p_this )
-{
-, *ppsz_path, *psz
+s, *path, *paths
-
-#if defined( WIN32 ) || defined( UNDER_CE )
-    const char * extra_path = "";
-#else
-
+":" 
-#endif
-
-    /* If the user provided a plugin path, we add it to the list */
-
-
-
-
+
+
+
-    {
-        msg_Err( p_this, "Not enough memory" );
-
+s
-        return;
-    }
-
-    /* Free plugin-path */
-
-
-psz_path = path; !end
+s
+
+aths_iter = paths; paths_iter
-    {
-        char *psz_fullpath;
-
-
-
-
-
+
+
+
+
+
+
+
-
-#if defined( SYS_BEOS ) || defined( __APPLE__ ) || defined( WIN32 )
@@ -948 +988 @@
-        /* Handle relative as well as absolute paths */
-#ifdef WIN32
-psz_path[0] != '\\' && ppsz_path[0] != '/' && ppsz_
+ath[0] != '\\' && path[0] != '/' && 
-#else
-psz_p
+
-#endif
-        {
-            if( 0>= asprintf( &psz_fullpath, "%s"DIR_SEP"%s",
-psz_p
+
-                psz_fullpath = NULL;
-        }
-        else
-#endif
-psz_p
+
-
-        if( psz_fullpath == NULL )
@@ -970 +1010 @@
-
-        free( psz_fullpath );
-
-
-
-
-
+
+
+
+
-}
-