Changeset dbae916 for libcfa/src/interpose.cfa

Timestamp:

Mar 14, 2023, 4:21:05 PM (16 months ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

1afd9ccb, 360bfe41, 6e6989c

Parents:

5217569 (diff), c19ca4b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• libcfa/src/interpose.cfa (modified) (4 diffs)

libcfa/src/interpose.cfa

@@ -10 +10 @@
 // Created On       : Wed Mar 29 16:10:31 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar  2 13:56:26 2023
-// Update Count     : 191
-//
-
-#include <stdarg.h>                                                                             // va_start, va_end
+// Last Modified On : Mon Mar 13 22:39:12 2023
+// Update Count     : 193
+//
+
 #include <stdio.h>
-#include <string.h>                                                                             // strlen
 #include <unistd.h>                                                                             // _exit, getpid
-#include <signal.h>
 extern "C" {
 #include <dlfcn.h>                                                                              // dlopen, dlsym
@@ -24 +21 @@
 }
 
-#include "bits/debug.hfa"
 #include "bits/defs.hfa"
 #include "bits/signal.hfa"                                                              // sigHandler_?
@@ -40 +36 @@
 
 typedef void (* generic_fptr_t)(void);
+
 static generic_fptr_t do_interpose_symbol( void * library, const char symbol[], const char version[] ) {
-        const char * error;
-
         union { generic_fptr_t fptr; void * ptr; } originalFunc;
 
         originalFunc.ptr = dlsym( library, symbol );
-        error = dlerror();
-        if ( error ) abort( "interpose_symbol : internal error, %s\n", error );
-
+        if ( ! originalFunc.ptr ) {                                                             // == nullptr
+                abort( "interpose_symbol : internal error, %s\n", dlerror() );
+        } // if
         return originalFunc.fptr;
 }
@@ -57 +52 @@
         library = RTLD_NEXT;
         #else
+        // missing RTLD_NEXT => must hard-code library name, assuming libstdc++
         library = dlopen( "libc.so.6", RTLD_LAZY );
-        if ( ! library ) {
-                const char * error = dlerror();
-                if ( error ) {
-                        abort( "interpose_symbol : failed to open libc, %s\n", error );
-                } // if
+        if ( ! library ) {                                                                      // == nullptr
+                abort( "interpose_symbol : failed to open libc, %s\n", dlerror() );
         } // if
-        #endif
-
-        return do_interpose_symbol(library, symbol, version);
+        #endif // RTLD_NEXT
+
+        return do_interpose_symbol( library, symbol, version );
 }