Use the path to libgvc.so from /proc/self/maps to determine path for config.

So long as dot can find libgvc.so, e.g. using LD_LIBRARY_PATH, then it can be binary-relocated.

diff --git a/lib/gvc/gvconfig.c b/lib/gvc/gvconfig.c
index 445a937392fa665efe40c8e1cf3e0e401edf0c4f..7e09deb72c5a24d4bf6fbb1cd6d290b1f2d56e39 100644 (file)
--- a/lib/gvc/gvconfig.c
+++ b/lib/gvc/gvconfig.c
@@ -49,10 +49,6 @@
         VTX_CodeGen, GD_CodeGen, memGD_CodeGen;
 #endif
 
-#ifndef DISABLE_LTDL
-static char *libdir = GVLIBDIR;
-#endif
-
 /*
     A config for gvrender is a text file containing a
     list of plugin librariess and their capabilities using a tcl-like
@@ -221,6 +217,40 @@ static void gvconfig_write_library_config(char *path, gvplugin_library_t *librar
     fputs ("}\n", f);
 }
 
+char * gvconfig_libdir(void)
+{
+    static char line[1024];
+    static char *libdir;
+    char *path, *tmp;
+    FILE *f;
+
+    if (!libdir) {
+
+        /* this only works on linux, other systems will get GVLIBDIR only */
+       libdir = GVLIBDIR;
+        f = fopen ("/proc/self/maps", "r");
+        if (f) {
+            while (!feof (f)) {
+               if (!fgets (line, sizeof (line), f))
+                   continue;
+               if (!strstr (line, " r-xp "))
+                   continue;
+               path = strchr (line, '/');
+               if (!path)
+                   continue;
+               tmp = strstr (path, "/libgvc.");
+               if (tmp) {
+                   *tmp = 0;
+                   libdir = path;
+                   break;
+               }
+            }
+            fclose (f);
+        }
+    }
+    return libdir;
+}
+
 #ifdef DISABLE_LTDL
 extern gvplugin_library_t *builtins[];
 #endif
@@ -230,7 +260,7 @@ static void config_rescan(GVC_t *gvc, char *config_path)
 {
     FILE *f = NULL;
     glob_t globbuf;
-    char *config_glob, *path;
+    char *config_glob, *path, *libdir;
     int i, rc;
     gvplugin_library_t *library;
     char *plugin_glob = "libgvplugin*.so.?";
@@ -242,6 +272,8 @@ static void config_rescan(GVC_t *gvc, char *config_path)
        }
     }
 
+    libdir = gvconfig_libdir();
+
     /* load all libraries even if can't save config */
     config_glob = malloc(strlen(libdir)
                            + 1
@@ -406,7 +438,7 @@ void gvconfig(GVC_t * gvc, boolean rescan)
     struct stat config_st, libdir_st;
     FILE *f = NULL;
     char *config_path = NULL, *config_text = NULL;
-
+    char *libdir;
     char *config_file_name = "config";
 
 #define MAX_SZ_CONFIG 100000
@@ -426,15 +458,15 @@ void gvconfig(GVC_t * gvc, boolean rescan)
     }
 #else
     /* see if there are any new plugins */
-
+    libdir = gvconfig_libdir();
     rc = stat(libdir, &libdir_st);
     if (rc == -1) {    /* if we fail to stat it then it probably doesn't exist
                   so just fail silently */
        return;
     }
 
-    config_path = malloc(strlen(GVLIBDIR) + 1 + strlen(config_file_name) + 1);
-    strcpy(config_path, GVLIBDIR);
+    config_path = malloc(strlen(libdir) + 1 + strlen(config_file_name) + 1);
+    strcpy(config_path, libdir);
     strcat(config_path, "/");
     strcat(config_path, config_file_name);
        

diff --git a/lib/gvc/gvcproc.h b/lib/gvc/gvcproc.h
index 5a71be60dd76845a34bede43cd9ac69ae79ae6c6..1a8605bf0c3d371941830ee216ce90a03df17598 100644 (file)
--- a/lib/gvc/gvcproc.h
+++ b/lib/gvc/gvcproc.h
@@ -31,6 +31,7 @@ extern "C" {
 
 /* configuration */
 
+    extern char *gvconfig_libdir(void);
     extern void gvconfig(GVC_t * gvc, boolean rescan);
     extern char *gvhostname(void);
 

diff --git a/lib/gvc/gvplugin.c b/lib/gvc/gvplugin.c
index 754b156c452ab5cc6599094d91e4803b26ce5b42..ee3f5970a2959f6acab16c2b58c7fd720805c9ae 100644 (file)
--- a/lib/gvc/gvplugin.c
+++ b/lib/gvc/gvplugin.c
@@ -33,10 +33,6 @@
 #include        "gvcint.h"
 #include        "gvcproc.h"
 
-#ifndef DISABLE_LTDL
-static char *libdir = GVLIBDIR;
-#endif
-
 /*
  * Define an apis array of name strings using an enumerated api_t as index.
  * The enumerated type is defined gvplugin.h.  The apis array is
@@ -111,9 +107,10 @@ gvplugin_library_t *gvplugin_library_load(char *path)
     int len;
     static char *p;
     static int lenp;
-
+    char *libdir;
     char *suffix = "_LTX_library";
 
+    libdir = gvconfig_libdir();
     len = strlen(libdir) + 1 + strlen(path) + 1;
     if (len > lenp) {
        lenp = len+20;