Temporary debugging

Author: topolarity

cli/loader_library_probe.c

@@ -89,6 +89,8 @@ const char *jl_loader_probe_system_library(const char *libname, const char *symb
 {
     char buf[PATH_MAX];
 
+    fprintf(stderr, "scanning LD_LIBRARY_PATH\n");
+
     /**
      * Make a best-effort attempt to emulate the linker's use of LD_LIBRARY_PATH
      **/
@@ -117,6 +119,8 @@ const char *jl_loader_probe_system_library(const char *libname, const char *symb
         }
     }
 
+    fprintf(stderr, "scanning ld.so.cache\n");
+
     /**
      * Check the ld.so.cache for the library. Assuming we can find the cache,
      * this is by far our best chance to locate the lib successfully.
@@ -145,6 +149,8 @@ const char *jl_loader_probe_system_library(const char *libname, const char *symb
         munmap((void *)cache, sz);
     }
 
+    fprintf(stderr, "scanning default libdirs\n");
+
     /**
      * As a last-ditch effort, try to emulate / search the "default" libdirs used
      * by the GLIBC dynamic linker.
@@ -156,6 +162,7 @@ const char *jl_loader_probe_system_library(const char *libname, const char *symb
         buf[0] = '\0';
         strcat(buf, default_libdirs[i]);
         strcat(buf, libname);
+	fprintf(stderr, "default libdir: \"%s\"\n", buf);
         if (jl_loader_locate_symbol(buf, symbol))
             return strdup(buf);
     }

cli/loader_symbol_probe.c

@@ -96,15 +96,21 @@ int jl_loader_locate_symbol(const char *library, const char *symbol)
 {
     int found = 0;
 
+    fprintf(stderr, "library: \"%s\" symbol: \"%s\"", library, symbol);
+
     size_t library_sz;
     void *elf_file = jl_loader_open_via_mmap(library, &library_sz);
     if (elf_file == NULL)
-        goto bail;
+        return 0;
+
+    fprintf(stderr, "checking header\n");
 
     const char *hdr = (const char *)elf_file;
     if (strncmp(hdr, ELFMAG, SELFMAG) != 0)
         goto bail;
 
+    fprintf(stderr, "locate symbol\n");
+
     assert(hdr[5] == ELFDATA2LSB);
     if (hdr[4] == ELFCLASS32) {
         found = Elf32_locate_symbol((Elf32_Ehdr *)hdr, symbol);