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

Timestamp:

Jan 3, 2007, 10:09:41 AM (14 years ago)

Author:

Sam Hocevar

Message:

• The whole crap now builds on OS X. Now if it only agreed to run, too...

File:

• zzuf/trunk/src/zzuf.c (modified) (4 diffs)

zzuf/trunk/src/zzuf.c

@@ -44 +44 @@
 static char *merge_regex(char *, char *);
 static char *merge_file(char *, char *);
-static void set_ld_preload(char const *);
+static void set_environment(char const *);
 static void version(void);
 #if defined(HAVE_GETOPT_H)
@@ -223 +223 @@
 
     /* Preload libzzuf.so */
-    set_ld_preload(argv[0]);
+    set_environment(argv[0]);
 
     /* Create new argv */
@@ -484 +484 @@
 }
 
-static void set_ld_preload(char const *progpath)
+static void set_environment(char const *progpath)
 {
     char *libpath, *tmp;
     int len = strlen(progpath);
+#ifdef __APPLE__
+    char const *preload = "DYLD_INSERT_LIBRARIES";
+    setenv("DYLD_FORCE_FLAT_NAMESPACE", "1", 1);
+#else
+    char const *preload = "LD_PRELOAD";
+#endif
 
     libpath = malloc(len + strlen("/.libs/libzzuf.so") + 1);
@@ -494 +500 @@
     strcpy(tmp ? tmp + 1 : libpath, ".libs/libzzuf.so");
     if(access(libpath, R_OK) == 0)
-        setenv("LD_PRELOAD", libpath, 1);
+        setenv(preload, libpath, 1);
     else
-        setenv("LD_PRELOAD", LIBDIR "/libzzuf.so", 1);
+        setenv(preload, LIBDIR "/libzzuf.so", 1);
     free(libpath);
 }