vlc_getcwd: return current directory as UTF-8

diff --git a/include/vlc_fs.h b/include/vlc_fs.h
index e3ab442db86ec71889b8b603b275d7eb5eee9e86..65cd4cbb88b2a948d43512dca9f8696a00c8b984 100644 (file)
--- a/include/vlc_fs.h
+++ b/include/vlc_fs.h
@@ -43,6 +43,7 @@ VLC_API int vlc_mkdir( const char *filename, mode_t mode );
 
 VLC_API int vlc_unlink( const char *filename );
 VLC_API int vlc_rename( const char *oldpath, const char *newpath );
+VLC_API char *vlc_getcwd( void ) VLC_USED;
 
 #if defined( WIN32 )
 # ifndef UNDER_CE

diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index 4d937b9ad611ee1070642e028e9f0322613326e3..3b6de364679d2cc50d3614528a100f6342c085de 100644 (file)
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -467,6 +467,7 @@ vlc_stat
 vlc_strcasestr
 vlc_unlink
 vlc_rename
+vlc_getcwd
 vlc_dup
 vlc_pipe
 vlc_accept

diff --git a/src/posix/filesystem.c b/src/posix/filesystem.c
index aadf35b63b77554386b19af9dd41d87a63e216f5..3347496a78d78552f650fdc3488038e10bcda4ee 100644 (file)
--- a/src/posix/filesystem.c
+++ b/src/posix/filesystem.c
@@ -306,6 +306,53 @@ error:
     return ret;
 }
 
+/**
+ * Determines the current working directory.
+ *
+ * @return the current working directory (must be free()'d)
+ *         or NULL on error
+ */
+char *vlc_getcwd (void)
+{
+    /* Try $PWD */
+    const char *pwd = getenv ("PWD");
+    if (pwd != NULL)
+    {
+        struct stat s1, s2;
+        /* Make sure $PWD is correct */
+        if (stat (pwd, &s1) == 0 && stat (".", &s2) == 0
+         && s1.st_dev == s2.st_dev && s1.st_ino == s2.st_ino)
+            return ToLocaleDup (pwd);
+    }
+
+    /* Otherwise iterate getcwd() until the buffer is big enough */
+    long path_max = pathconf (".", _PC_PATH_MAX);
+    size_t size = (path_max == -1 || path_max > 4096) ? 4096 : path_max;
+
+    for (;; size *= 2)
+    {
+        char *buf = malloc (size);
+        if (unlikely(buf == NULL))
+            break;
+
+        if (getcwd (buf, size) != NULL)
+#ifdef ASSUME_UTF8
+            return buf;
+#else
+        {
+            char *ret = ToLocaleDup (buf);
+            free (buf);
+            return ret; /* success */
+        }
+#endif
+        free (buf);
+
+        if (errno != ERANGE)
+            break;
+    }
+    return NULL;
+}
+
 /**
  * Duplicates a file descriptor. The new file descriptor has the close-on-exec
  * descriptor flag set.

diff --git a/src/win32/filesystem.c b/src/win32/filesystem.c
index dfcaee8032cca02f2aed547ab113eaa5921c114d..0ba5e0a674034aca112f459b3d4704939a015bdc 100644 (file)
--- a/src/win32/filesystem.c
+++ b/src/win32/filesystem.c
@@ -108,6 +108,17 @@ int vlc_mkdir( const char *dirname, mode_t mode )
 #endif
 }
 
+char *vlc_getcwd (void)
+{
+    wchar_t *wdir = _wgetcwd (NULL, 0);
+    if (wdir == NULL)
+        return NULL;
+
+    char *dir = FromWide (wdir);
+    free (wdir);
+    return dir;
+}
+
 /* Under Windows, these wrappers return the list of drive letters
  * when called with an empty argument or just '\'. */
 typedef struct vlc_DIR