Typos

[vlc] / src / text / strings.c

diff --git a/src/text/strings.c b/src/text/strings.c
index eb0350aa651f22a1473b6013ab4f9922c2b99e0f..8ae50a508985b65be0c2ae0195203b090d47ab75 100644 (file)
--- a/src/text/strings.c
+++ b/src/text/strings.c
@@ -109,7 +109,6 @@ char *decode_URI( char *psz )
         }
     }
     *out = '\0';
-    EnsureUTF8( psz );
     return psz;
 }
 
@@ -1079,7 +1078,7 @@ char *make_URI (const char *path)
 #ifndef WIN32
         /* \\host\share\path -> smb://host/share/path */
         if (strchr (path + 2, '\\') != NULL)
-        {   /* Convert antislashes to slashes */
+        {   /* Convert backslashes to slashes */
             char *dup = strdup (path);
             if (dup == NULL)
                 return NULL;
@@ -1166,20 +1165,6 @@ char *make_path (const char *url)
     size_t schemelen = ((end != NULL) ? end : path) - url;
     path += 3; /* skip "://" */
 
-#ifdef WIN32
-
-    /* skip leading slash before disk drive
-     * when format is file:///C:/path/file.ext
-     */
-    if (schemelen == 4 && !strncasecmp (url, "file", 4))
-    {
-        char* search = strstr (path, ":/");
-        if( search && *path == '/' && search == path+2 )
-            path++;
-    }
-
-#endif
-
     /* Remove HTML anchor if present */
     end = strchr (path, '#');
     if (end)
@@ -1195,32 +1180,26 @@ char *make_path (const char *url)
     if (schemelen == 4 && !strncasecmp (url, "file", 4))
     {
 #if (DIR_SEP_CHAR != '/')
-        for (char *p = strchr (path, '/'); p; p = strchr (p, '/'))
-            *p++ = DIR_SEP_CHAR;
+        for (char *p = strchr (path, '/'); p; p = strchr (p + 1, '/'))
+            *p = DIR_SEP_CHAR;
 #endif
-
-#ifdef WIN32
-
-        /* check for disk drive in the form 'C:\...' */
-        char* search = strstr (path, ":"DIR_SEP);
-        if( search && search == path+1 )
-            return path;
-
-        if (*path && asprintf (&ret, "\\\\%s", path) == -1)
-            ret = NULL;
-
-        goto out;
-#else
+        /* Leading slash => local path */
         if (*path == DIR_SEP_CHAR)
+#if !defined (WIN32) || defined (UNDER_CE)
             return path;
+#else
+            return memmove (path, path + 1, strlen (path + 1) + 1);
+#endif
 
         /* Local path disguised as a remote one (MacOS X) */
         if (!strncasecmp (path, "localhost"DIR_SEP, 10))
-        {
-            memmove (path, path + 9, strlen (path + 9) + 1);
-            return path;
-        }
+            return memmove (path, path + 9, strlen (path + 9) + 1);
+
+#ifdef WIN32
+        if (*path && asprintf (&ret, "\\\\%s", path) == -1)
+            ret = NULL;
 #endif
+        /* non-local path :-( */
     }
     else
     if (schemelen == 2 && !strncasecmp (url, "fd", 2))
@@ -1240,13 +1219,14 @@ char *make_path (const char *url)
                 ret = strdup ("/dev/stdout");
                 break;
             case 2:
-                ret = strdup ("/dev/strerr");
+                ret = strdup ("/dev/stderr");
                 break;
             default:
                 if (asprintf (&ret, "/dev/fd/%d", fd) == -1)
                     ret = NULL;
         }
 #else
+        /* XXX: Does this work on WinCE? */
         if (fd < 2)
             ret = strdup ("CON");
         else