Changeset e892c8 in git for resources

Timestamp:

Aug 22, 2021, 4:46:03 PM (3 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

854df13ac6faa7e37e7ed222c82d310f0c36eac1

Parents:

5a396694da96c8e76a3c80f05fb25154009743c4

Message:

extend omFindExec by LD_LIBRARY_PATH and BIN_DIR

File:

• resources/omFindExec.c (modified) (1 diff)

resources/omFindExec.c

@@ -123 +123 @@
       }
     }
+    /* try again with LD_LIBRARY_PATH */
+    search = getenv("LD_LIBRARY_PATH");
+    p = search;
+
+    if ((p != NULL)&&(strlen(p)>1))
+    {
+      while (1)
+      {
+        char *next;
+        next = tbuf;
+
+        /* Copy directory name into [tbuf]. */
+        /* This is somewhat tricky: empty names mean cwd, w.r.t. some
+           shell spec */
+        while (*p && *p != ':')
+          *next ++ = *p ++;
+        *next = '\0';
+
+        if (tbuf[strlen(tbuf)-1] != '/') strcat(tbuf, "/");
+        strcat (tbuf, name);
+
+        /* If the named file exists, then return it. */
+        if (! access (tbuf, F_OK))
+        {
+          strcpy(executable, tbuf);
+          return executable;
+        }
+
+        if (*p != '\0')
+        {
+          p ++;
+        }
+        else
+        {
+          break;
+        }
+      }
+    }
+  }
+  /* everything failed, so try the compiled path: */
+  strcpy(tbuf,BIN_DIR);
+  strcat(tbuf,"/");
+  strcat(tbuf,name);
+  /* If the named file exists, then return it. */
+  if (! access (tbuf, F_OK))
+  {
+    strcpy(executable, tbuf);
+    return executable;
   }
   return NULL;