Split file path functions out of vlc_charset.h into vlc_fs.h

[vlc] / src / text / filesystem.c

diff --git a/src/text/filesystem.c b/src/text/filesystem.c
index f6bab4a9088975974872b7e2e6a5e17cfeaa4934..218c4a534e0cab7aa592cbb496bf427528860d0f 100644 (file)
--- a/src/text/filesystem.c
+++ b/src/text/filesystem.c
@@ -30,6 +30,7 @@
 
 #include <vlc_common.h>
 #include <vlc_charset.h>
+#include <vlc_fs.h>
 #include "libvlc.h" /* utf8_mkdir */
 #include <vlc_rand.h>
 
@@ -99,6 +100,10 @@ int utf8_open (const char *filename, int flags, ...)
         mode = va_arg (ap, unsigned int);
     va_end (ap);
 
+#ifdef O_CLOEXEC
+    flags |= O_CLOEXEC;
+#endif
+
 #ifdef UNDER_CE
     /*_open translates to wchar internally on WinCE*/
     return _open (filename, flags, mode);
@@ -119,22 +124,11 @@ int utf8_open (const char *filename, int flags, ...)
         return -1;
     }
 
-    int fd;
-
-#ifdef O_CLOEXEC
-    fd = open (local_name, flags | O_CLOEXEC, mode);
-    if (fd == -1 && errno == EINVAL)
-#endif
-    {
-        fd = open (local_name, flags, mode);
+    int fd = open (local_name, flags, mode);
 #ifdef HAVE_FCNTL
-        if (fd != -1)
-        {
-            int flags = fcntl (fd, F_GETFD);
-            fcntl (fd, F_SETFD, FD_CLOEXEC | ((flags != -1) ? flags : 0));
-        }
+    if (fd != -1)
+        fcntl (fd, F_SETFD, FD_CLOEXEC);
 #endif
-    }
 
     LocaleFree (local_name);
     return fd;