Changeset 1707Tweet

Timestamp:

Jan 25, 2007, 12:59:33 PM (16 years ago)

Author:

Sam Hocevar

Message:

• Oops, fix in-tree preloading!

Location:

zzuf/trunk/src

Files:

• opts.h (modified) (1 diff)
• zzuf.c (modified) (5 diffs)

zzuf/trunk/src/opts.h

@@ -19 +19 @@
 struct opts
 {
-    char const **newargv;
+    char **oldargv;
+    char **newargv;
     char *bytes, *protect, *refuse;
     uint32_t seed;

zzuf/trunk/src/zzuf.c

@@ -67 +67 @@
 
 static void loop_stdin(struct opts *);
-static int run_process(char const *[]);
+static int run_process(char const *, char *[]);
 
 static void spawn_children(struct opts *);
@@ -353 +353 @@
 
     /* Create new argv */
+    opts->oldargv = argv;
     opts->newargv = malloc((argc - optind + 1) * sizeof(char *));
     memcpy(opts->newargv, argv + optind, (argc - optind) * sizeof(char *));
@@ -576 +577 @@
 
 #if defined HAVE_FORK
-        if(run_process(opts->newargv) < 0)
+        if(run_process(opts->oldargv[0], opts->newargv) < 0)
             exit(EXIT_FAILURE);
         exit(EXIT_SUCCESS);
 #else
-        if(run_process(opts->newargv) < 0)
+        if(run_process(opts->oldargv[0], opts->newargv) < 0)
             return;
 #endif
@@ -838 +839 @@
 #endif
 
-static int run_process(char const *argv[])
+static int run_process(char const *zzuf_exe, char *argv[])
 {
 #if defined HAVE_FORK
     char *libpath, *tmp;
-    int ret, len = strlen(argv[0]);
+    int ret, len = strlen(zzuf_exe);
 #   if defined __APPLE__
 #       define FILENAME "libzzuf.dylib"
@@ -859 +860 @@
 
     libpath = malloc(len + strlen("/.libs/" FILENAME EXTRAINFO) + 1);
-    strcpy(libpath, argv[0]);
+    strcpy(libpath, zzuf_exe);
 
     tmp = strrchr(libpath, '/');