From: Rémi Denis-Courmont <remi@remlab.net>
Date: Sat, 26 Dec 2009 17:59:02 +0000 (+0200)
Subject: Revert "Win32: fix #2592 (stdin file input). It may impact other platforms, so please... 
X-Git-Tag: 1.1.0-ff~1726
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;ds=sidebyside;h=eeff52c80e2c3321b8de8e358ba41af65309d2be;p=vlc

Revert "Win32: fix #2592 (stdin file input). It may impact other platforms, so please test, and fix/revert if you see a bug."

This reverts commit e33a82dbd7ef005de310f67f7cc83a1bf0c71269.
This broke opening any file starting with a dash.
---

diff --git a/src/text/strings.c b/src/text/strings.c
index b69c9e54f1..09c4ed1e4c 100644
--- a/src/text/strings.c
+++ b/src/text/strings.c
@@ -1100,28 +1100,16 @@ char *make_URI (const char *path)
     }
     else
     if (path[0] != DIR_SEP_CHAR)
-    {
-        if(path[0] == '-')
-        {
-            /*reading from stdin*/
-            if (asprintf (&buf, "-") == -1)
-                return NULL;
-
-            return buf;
-        }
-        else
-        {
-            /* Relative path: prepend the current working directory */
-            char cwd[PATH_MAX];
+    {   /* Relative path: prepend the current working directory */
+        char cwd[PATH_MAX];
 
-            if (getcwd (cwd, sizeof (cwd)) == NULL) /* FIXME: UTF8? */
-                return NULL;
-            if (asprintf (&buf, "%s/%s", cwd, path) == -1)
-                return NULL;
-            char *ret = make_URI (buf);
-            free (buf);
-            return ret;
-        }
+        if (getcwd (cwd, sizeof (cwd)) == NULL) /* FIXME: UTF8? */
+            return NULL;
+        if (asprintf (&buf, "%s/%s", cwd, path) == -1)
+            return NULL;
+        char *ret = make_URI (buf);
+        free (buf);
+        return ret;
     }
     else
         buf = strdup ("file://");