ThreadDisplayPreparePicture: simplify

[vlc] / src / posix / linux_specific.c

diff --git a/src/posix/linux_specific.c b/src/posix/linux_specific.c
index 7cc7a78766b296cb8eeffcf254db4c9b0cf5c80c..c31cbc28225cae9cfa0978b44773eda79c0a2119 100644 (file)
--- a/src/posix/linux_specific.c
+++ b/src/posix/linux_specific.c
@@ -26,7 +26,8 @@
 #include <string.h>
 
 #include <vlc_common.h>
-#include "../libvlc.h"
+#include "libvlc.h"
+#include "config/configuration.h"
 
 char *config_GetLibDir (void)
 {
@@ -73,3 +74,33 @@ char *config_GetLibDir (void)
 error:
     return (path != NULL) ? path : strdup (PKGLIBDIR);
 }
+
+char *config_GetDataDir (void)
+{
+    const char *path = getenv ("VLC_DATA_PATH");
+    if (path != NULL)
+        return strdup (path);
+
+    char *libdir = config_GetLibDir ();
+    if (libdir == NULL)
+        return NULL; /* OOM */
+
+    char *datadir = NULL;
+
+    /* There are no clean ways to do this, are there?
+     * Due to multilibs, we cannot simply append ../share/. */
+    char *p = strstr (libdir, "/lib/");
+    if (p != NULL)
+    {
+        char *p2;
+        /* Deal with nested "lib" directories. Grmbl. */
+        while ((p2 = strstr (p + 4, "/lib/")) != NULL)
+            p = p2;
+        *p = '\0';
+
+        if (unlikely(asprintf (&datadir, "%s/share/"PACKAGE, libdir) == -1))
+            datadir = NULL;
+    }
+    free (libdir);
+    return (datadir != NULL) ? datadir : strdup (PKGDATADIR);
+}