Changeset 1629 for zzuf/trunk/src/zzuf.cTweet

Timestamp:

Jan 8, 2007, 10:49:57 PM (14 years ago)

Author:

Sam Hocevar

Message:

• Tru64 loader support (_RLD_LIST).

File:

• zzuf/trunk/src/zzuf.c (modified) (1 diff)

zzuf/trunk/src/zzuf.c

@@ -614 +614 @@
 {
     char *libpath, *tmp;
-    int len = strlen(progpath);
-#ifdef __APPLE__
+    int ret, len = strlen(progpath);
+#if defined __APPLE__
 #   define FILENAME "libzzuf.dylib"
+#   define EXTRAINFO ""
 #   define PRELOAD "DYLD_INSERT_LIBRARIES"
     setenv("DYLD_FORCE_FLAT_NAMESPACE", "1", 1);
+#elif defined __osf__
+#   define FILENAME "libzzuf.so"
+#   define EXTRAINFO ":DEFAULT"
+#   define PRELOAD "_RLD_LIST"
 #else
 #   define FILENAME "libzzuf.so"
+#   define EXTRAINFO ""
 #   define PRELOAD "LD_PRELOAD"
 #endif
 
-    libpath = malloc(len + strlen("/.libs/" FILENAME) + 1);
+    libpath = malloc(len + strlen("/.libs/" FILENAME EXTRAINFO) + 1);
     strcpy(libpath, progpath);
+
     tmp = strrchr(libpath, '/');
     strcpy(tmp ? tmp + 1 : libpath, ".libs/" FILENAME);
-    if(access(libpath, R_OK) == 0)
+    ret = access(libpath, R_OK);
+
+    strcpy(tmp ? tmp + 1 : libpath, ".libs/" FILENAME EXTRAINFO);
+    if(ret == 0)
         setenv(PRELOAD, libpath, 1);
     else
-        setenv(PRELOAD, LIBDIR "/" FILENAME, 1);
+        setenv(PRELOAD, LIBDIR "/" FILENAME EXTRAINFO, 1);
     free(libpath);
 }