X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=src%2Fhookmacros.h;h=b5e2cb0b1fdb93d7ab95cb58012b6d5177ec3a00;hb=52b4e9114625a579d01686ec381439db7b25c635;hp=6f65d1e8e84ae86cd8974aea29fba3487201edd7;hpb=66140e14e485af27f5234ae7b744a50dff3dd4c9;p=coloredstderr%2Fcoloredstderr.git

diff --git a/src/hookmacros.h b/src/hookmacros.h
index 6f65d1e..b5e2cb0 100644
--- a/src/hookmacros.h
+++ b/src/hookmacros.h
@@ -22,46 +22,89 @@
 
 /* Hook the function by creating a function with the same name. With
  * LD_PRELOAD our function will be preferred. The original function is stored
- * in a static variable (real_*). */
+ * in a static variable (real_*). Any function called in these macros must
+ * make sure to restore the errno if it changes it.
+ *
+ * "Pseudo code" for the following macros. <name> is the name of the hooked
+ * function, <fd> is either a file descriptor or a FILE pointer.
+ *
+ *     if (!real_<name>) {
+ *         real_<name> = dlsym_function(<name>);
+ *         if (!initialized) {
+ *             init_from_environment();
+ *         }
+ *     }
+ *     if (tracked_fds_find(<fd>)) {
+ *         if (force_write_to_non_tty) {
+ *             handle = 1;
+ *         } else {
+ *             handle = isatty_noinline(<fd>);
+ *         }
+ *     } else {
+ *         handle = 0;
+ *     }
+ *
+ *     if (handle) {
+ *         handle_<fd>_pre(<fd>);
+ *     }
+ *     <type> result = real_<name>(<args>);
+ *     if (handle) {
+ *         handle_<fd>_post(<fd>);
+ *     }
+ *     return result;
+ */
 
 #define _HOOK_PRE(type, name) \
         int handle; \
-        int saved_errno = errno; \
-        DLSYM_FUNCTION(real_ ## name, #name);
+        if (unlikely(!(real_ ## name ))) { \
+            *(void **) (&(real_ ## name)) = dlsym_function(#name); \
+            /* Initialize our data while we're at it. */ \
+            if (unlikely(!initialized)) { \
+                init_from_environment(); \
+            } \
+        }
 #define _HOOK_PRE_FD(type, name, fd) \
         type result; \
         _HOOK_PRE_FD_(type, name, fd)
 #define _HOOK_PRE_FD_(type, name, fd) \
         _HOOK_PRE(type, name) \
-        handle = check_handle_fd(fd); \
-        if (handle) { \
-            handle_fd_pre(fd, handle); \
+        if (unlikely(tracked_fds_find(fd))) { \
+            if (unlikely(force_write_to_non_tty)) { \
+                handle = 1; \
+            } else { \
+                handle = isatty_noinline(fd); \
+            } \
+        } else { \
+            handle = 0; \
         } \
-        errno = saved_errno;
+        if (unlikely(handle)) { \
+            handle_fd_pre(fd); \
+        }
 #define _HOOK_PRE_FILE(type, name, file) \
         type result; \
         _HOOK_PRE(type, name) \
-        handle = check_handle_fd(fileno(file)); \
-        if (handle) { \
-            handle_file_pre(file, handle); \
+        if (unlikely(tracked_fds_find(fileno(file)))) { \
+            if (unlikely(force_write_to_non_tty)) { \
+                handle = 1; \
+            } else { \
+                handle = isatty_noinline(fileno(file)); \
+            } \
+        } else { \
+            handle = 0; \
         } \
-        errno = saved_errno;
-/* Save and restore the errno to make sure we return the errno of the original
- * function call. */
+        if (unlikely(handle)) { \
+            handle_file_pre(file); \
+        }
 #define _HOOK_POST_FD_(fd) \
-        if (handle) { \
-            saved_errno = errno; \
-            handle_fd_post(fd, handle); \
-            errno = saved_errno; \
+        if (unlikely(handle)) { \
+            handle_fd_post(fd); \
         }
 #define _HOOK_POST_FD(fd) \
         _HOOK_POST_FD_(fd) \
         return result;
 #define _HOOK_POST_FILE(file) \
-        if (handle) { \
-            saved_errno = errno; \
-            handle_file_post(file, handle); \
-            errno = saved_errno; \
+        if (unlikely(handle)) { \
+            handle_file_post(file); \
         } \
         return result;
 
@@ -133,8 +176,7 @@
     }
 #define HOOK_VAR_FILE3(type, name, file, func, type1, arg1, type2, arg2, type3, arg3) \
     static type (*real_ ## func)(type1, type2, type3, va_list); \
-    type name(type1 arg1, type2 arg2, type3 arg3, ...) \
-    { \
+    type name(type1 arg1, type2 arg2, type3 arg3, ...) { \
         va_list ap; \
         _HOOK_PRE_FILE(type, func, file) \
         va_start(ap, arg3); \