[patch] non-symlink-0.84a.patch

non-symlink-0.84a.patch (text/plain), 1.47 KB, created by Bill Cavalieri on 2004-02-25 02:43:20 UTC

--- src/comp/gbi.c.orig	2004-02-07 11:33:10.000000000 -0600
+++ src/comp/gbi.c	2004-02-24 01:14:57.000000000 -0600
@@ -54,6 +54,33 @@
 #include "gb_str.h"
 #include "gambas.h"
 
+/* needed to install in a different location than /usr */
+char *which(const char *app)
+{
+       char *path = NULL;
+       char *p = NULL;
+       char *rValue = NULL;
+
+       path = getenv("PATH");
+       if (!path) {
+               path = "/usr/bin/";
+       }
+       p = strtok(strdup(path), ":");
+       while (p) {
+               rValue = (char *)calloc(sizeof(char), strlen(p)+strlen(app)+2);
+               strcat(rValue, p);
+               rValue[strlen(p)] = '/';
+               strcat(rValue, app);
+               rValue[strlen(p)+1+strlen(app)] = '\0';
+               if (access(rValue, X_OK) == 0) {
+                       return rValue;
+               }
+               p = strtok(NULL, ":");
+               free(rValue);
+               rValue = NULL;
+       }
+       return NULL;
+}
 
 PRIVATE char _lib_path[MAX_PATH + 1];
 PRIVATE FILE *out;
@@ -426,7 +453,7 @@
   if (strcmp(name, "gb") == 0)
   {
     sprintf(path, LIB_PATTERN, _lib_path, name);
-    dlib = dlopen("/usr/bin/gbx", RTLD_NOW);
+    dlib = dlopen(which("gbx"), RTLD_NOW);
     if (!dlib)
       error2("Cannot open component:", dlerror());
 
@@ -476,7 +503,7 @@
   sprintf(buf, "LD_PRELOAD=%s", lib);
   putenv(buf);
   putenv("GAMBAS_PRELOAD=1");
-  execv("/usr/bin/gbi", argv);
+  execvp("gbi", argv);
 #endif
 }