Changeset 1796 for zzufTweet

Timestamp:

Jul 10, 2007, 1:51:49 AM (13 years ago)

Author:

Sam Hocevar

Message:

• Do not clobber LD_PRELOAD, patch by Sami Liedes. Heavily rewritten.

Location:

zzuf/trunk

Files:

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

zzuf/trunk/AUTHORS

@@ -8 +8 @@
  Clément Stenac <zorglub#diwi:org> (pread)
  Dominik Kuhlen <dominik.kuhlen#gmit-gmbh:de> (recvfrom)
-
+ Sami Liedes <sliedes#cc:hut:fi> (LD_PRELOAD conservation)

zzuf/trunk/src/zzuf.c

@@ -910 +910 @@
 
 #if defined HAVE_FORK
-    libpath = malloc(len + strlen("/.libs/" FILENAME EXTRAINFO) + 1);
+    /* Meaningless but makes sure there is space for everything */
+    libpath = malloc(len + strlen(LIBDIR "/.libs/" FILENAME EXTRAINFO) + 1);
     strcpy(libpath, opts->oldargv[0]);
 
+    /* Replace "/path/binaryname" with "/path/.libs/libzzuf.$(EXT)"
+     *     and "binaryname" with ".libs/libzzuf.$(EXT)"
+     * Write the result in libpath. */
     tmp = strrchr(libpath, '/');
     strcpy(tmp ? tmp + 1 : libpath, ".libs/" FILENAME);
+
     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 EXTRAINFO, 1);
+    if(ret < 0)
+        strcpy(libpath, LIBDIR "/" FILENAME);
+
+    /* OSF1 only */
+    strcat(libpath, EXTRAINFO);
+
+    /* Do not clobber previous LD_PRELOAD values */
+    tmp = getenv(PRELOAD);
+    if(tmp && *tmp)
+    {
+        char *bigbuf = malloc(strlen(tmp) + strlen(libpath) + 2);
+        sprintf(bigbuf, "%s:%s", tmp, libpath);
+        free(libpath);
+        libpath = bigbuf;
+    }
+
+    setenv(PRELOAD, libpath, 1);
     free(libpath);