Changeset 4809Tweet

Timestamp:

04/17/12 01:02:42 (14 months ago)

Author:

sam

Message:

Fix a weird problem with lib6 versioned symbols.

Location:

zzuf/trunk

Files:

• configure.ac (modified) (1 diff)
• msvc/config.h (modified) (1 diff)
• src/libzzuf/lib-fd.c (modified) (1 diff)
• src/libzzuf/lib-load.h (modified) (1 diff)
• src/libzzuf/lib-mem.c (modified) (1 diff)
• src/libzzuf/sys.c (modified) (3 diffs)

zzuf/trunk/configure.ac

@@ -179 +179 @@
 AC_DEFINE_UNQUOTED(ATTRIBUTE_PRINTF(x,y), $ac_v_attribute_printf, [Define to the __printf__ attribute if present])
 
+AC_CHECK_LIB(dl, dladdr,
+ [AC_DEFINE(HAVE_DLADDR, 1, Define to 1 if you have the `dladdr' function.)])
+
 AC_CHECK_LIB(m, log, [MATH_LIBS="-lm"])
 AC_SUBST(MATH_LIBS)

zzuf/trunk/msvc/config.h

@@ -29 +29 @@
 #define HAVE_CREATEFILEA 1
 #define HAVE_CREATEFILEW 1
+/* #undef HAVE_DLADDR */
 /* #undef HAVE_DLFCN_H */
 #define HAVE_DUP 1

zzuf/trunk/src/libzzuf/lib-fd.c

@@ -21 +21 @@
 #include "config.h"
 
-/* Need this for RTLD_NEXT */
-#define _GNU_SOURCE
 /* Use this to get lseek64() on glibc systems */
 #define _LARGEFILE64_SOURCE

zzuf/trunk/src/libzzuf/lib-load.h

@@ -30 +30 @@
                  * the linker to load us fully. */ \
                 _zz_init(); \
-                ORIG(x) = dlsym(RTLD_NEXT, STR(x)); \
+                extern void *_zz_dl_lib; \
+                ORIG(x) = dlsym(_zz_dl_lib, STR(x)); \
             } \
             if(!ORIG(x)) \

zzuf/trunk/src/libzzuf/lib-mem.c

@@ -17 +17 @@
 #include "config.h"
 
-/* Need this for RTLD_NEXT */
+/* Need this for off64_t */
 #define _GNU_SOURCE
 /* Need this for MAP_ANON and valloc() on FreeBSD (together with cdefs.h) */

zzuf/trunk/src/libzzuf/sys.c

@@ -17 +17 @@
 #include "config.h"
 
+/* Need this for RTLD_NEXT */
+#define _GNU_SOURCE
+
 #if defined HAVE_STDINT_H
 #   include <stdint.h>
 #elif defined HAVE_INTTYPES_H
 #   include <inttypes.h>
+#endif
+
+#ifdef HAVE_DLFCN_H
+#   include <dlfcn.h>
 #endif
 
@@ -35 +42 @@
 #include "sys.h"
 #include "lib-load.h"
+
+#if defined HAVE_DLFCN_H
+void *_zz_dl_lib = RTLD_NEXT;
+#endif
 
 #if defined HAVE_WINDOWS_H
@@ -78 +89 @@
     }
     CloseHandle(list);
+#elif defined HAVE_DLFCN_H
+    /* If glibc is recent enough, we use dladdr() to get its address. This
+     * way we are sure that the symbols we load are the most recent version,
+     * or we may get weird problems. We choose fileno as a random symbol to
+     * get, because we know we don't divert it. */
+#   if HAVE_DLADDR
+    Dl_info di;
+    if (dladdr(&fileno, &di) != 0)
+    {
+        void *lib = dlopen(di.dli_fname, RTLD_NOW);
+        if (lib)
+            _zz_dl_lib = lib;
+    }
+#   endif
 #else
     /* Nothing to do on our platform */