X-Git-Url: https://ruderich.org/simon/gitweb/?p=coloredstderr%2Fcoloredstderr.git;a=blobdiff_plain;f=src%2Fhookmacros.h;h=539d0d9d93fc241ca360df59cc9e4a9db6ee8033;hp=6b52293495eb166120294356637f674d7afda9cc;hb=a58d1a9017a1a15a237f5b516fe2c44a0f01482e;hpb=86352712fdc5fa08777eca1458f4ef6bbe579e7b

diff --git a/src/hookmacros.h b/src/hookmacros.h
index 6b52293..539d0d9 100644
--- a/src/hookmacros.h
+++ b/src/hookmacros.h
@@ -54,7 +54,7 @@
  *     return result;
  */
 
-#define _HOOK_PRE(type, name) \
+#define _HOOK_PRE(type, name, fd) \
         int handle; \
         if (unlikely(!(real_ ## name ))) { \
             *(void **) (&(real_ ## name)) = dlsym_function(#name); \
@@ -62,12 +62,8 @@
             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) \
+        } \
+        /* Check if this fd should be handled. */ \
         if (unlikely(tracked_fds_find(fd))) { \
             if (unlikely(force_write_to_non_tty)) { \
                 handle = 1; \
@@ -76,22 +72,18 @@
             } \
         } else { \
             handle = 0; \
-        } \
+        }
+#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, fd) \
         if (unlikely(handle)) { \
             handle_fd_pre(fd); \
         }
 #define _HOOK_PRE_FILE(type, name, file) \
         type result; \
-        _HOOK_PRE(type, name) \
-        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; \
-        } \
+        _HOOK_PRE(type, name, fileno(file)) \
         if (unlikely(handle)) { \
             handle_file_pre(file); \
         }
@@ -109,81 +101,137 @@
         return result;
 
 
-#define HOOK_VOID1(type, name, fd, type1, arg1) \
+#define HOOK_FUNC_DEF1(type, name, type1, arg1) \
     static type (*real_ ## name)(type1); \
-    type name(type1 arg1) { \
+    type name(type1) visibility_protected; \
+    type name(type1 arg1)
+#define HOOK_FUNC_DEF2(type, name, type1, arg1, type2, arg2) \
+    static type (*real_ ## name)(type1, type2); \
+    type name(type1, type2) visibility_protected; \
+    type name(type1 arg1, type2 arg2)
+#define HOOK_FUNC_DEF3(type, name, type1, arg1, type2, arg2, type3, arg3) \
+    static type (*real_ ## name)(type1, type2, type3); \
+    type name(type1, type2, type3) visibility_protected; \
+    type name(type1 arg1, type2 arg2, type3 arg3)
+#define HOOK_FUNC_DEF4(type, name, type1, arg1, type2, arg2, type3, arg3, type4, arg4) \
+    static type (*real_ ## name)(type1, type2, type3, type4); \
+    type name(type1, type2, type3, type4) visibility_protected; \
+    type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4)
+
+#define HOOK_FUNC_VAR_DEF2(type, name, type1, arg1, type2, arg2) \
+    static type (*real_ ## name)(type1, type2, ...); \
+    type name(type1, type2, ...) visibility_protected; \
+    type name(type1 arg1, type2 arg2, ...)
+
+#define HOOK_FUNC_SIMPLE3(type, name, type1, arg1, type2, arg2, type3, arg3) \
+    type name(type1, type2, type3) visibility_protected; \
+    type name(type1 arg1, type2 arg2, type3 arg3)
+
+#define HOOK_FUNC_VAR_SIMPLE1(type, name, type1, arg1) \
+    type name(type1, ...) visibility_protected; \
+    type name(type1 arg1, ...)
+#define HOOK_FUNC_VAR_SIMPLE2(type, name, type1, arg1, type2, arg2) \
+    type name(type1, type2, ...) visibility_protected; \
+    type name(type1 arg1, type2 arg2, ...)
+#define HOOK_FUNC_VAR_SIMPLE3(type, name, type1, arg1, type2, arg2, type3, arg3) \
+    type name(type1, type2, type3, ...) visibility_protected; \
+    type name(type1 arg1, type2 arg2, type3 arg3, ...)
+
+#define HOOK_VOID1(type, name, fd, type1, arg1) \
+    HOOK_FUNC_DEF1(type, name, type1, arg1) { \
         _HOOK_PRE_FD_(type, name, fd) \
         real_ ## name(arg1); \
         _HOOK_POST_FD_(fd) \
     }
+#define HOOK_VOID2(type, name, fd, type1, arg1, type2, arg2) \
+    HOOK_FUNC_DEF2(type, name, type1, arg1, type2, arg2) { \
+        _HOOK_PRE_FD_(type, name, fd) \
+        real_ ## name(arg1, arg2); \
+        _HOOK_POST_FD_(fd) \
+    }
+#define HOOK_VOID3(type, name, fd, type1, arg1, type2, arg2, type3, arg3) \
+    HOOK_FUNC_DEF3(type, name, type1, arg1, type2, arg2, type3, arg3) { \
+        _HOOK_PRE_FD_(type, name, fd) \
+        real_ ## name(arg1, arg2, arg3); \
+        _HOOK_POST_FD_(fd) \
+    }
 
+#define HOOK_VAR_VOID1(type, name, fd, func, type1, arg1) \
+    HOOK_FUNC_VAR_SIMPLE1(type, name, type1, arg1) { \
+        va_list ap; \
+        va_start(ap, arg1); \
+        func(arg1, ap); \
+        va_end(ap); \
+    }
+#define HOOK_VAR_VOID2(type, name, fd, func, type1, arg1, type2, arg2) \
+    HOOK_FUNC_VAR_SIMPLE2(type, name, type1, arg1, type2, arg2) { \
+        va_list ap; \
+        va_start(ap, arg2); \
+        func(arg1, arg2, ap); \
+        va_end(ap); \
+    }
+
+#define HOOK_FD2(type, name, fd, type1, arg1, type2, arg2) \
+    HOOK_FUNC_DEF2(type, name, type1, arg1, type2, arg2) { \
+        _HOOK_PRE_FD(type, name, fd) \
+        result = real_ ## name(arg1, arg2); \
+        _HOOK_POST_FD(fd) \
+    }
 #define HOOK_FD3(type, name, fd, type1, arg1, type2, arg2, type3, arg3) \
-    static type (*real_ ## name)(type1, type2, type3); \
-    type name(type1 arg1, type2 arg2, type3 arg3) { \
+    HOOK_FUNC_DEF3(type, name, type1, arg1, type2, arg2, type3, arg3) { \
         _HOOK_PRE_FD(type, name, fd) \
         result = real_ ## name(arg1, arg2, arg3); \
         _HOOK_POST_FD(fd) \
     }
 
 #define HOOK_FILE1(type, name, file, type1, arg1) \
-    static type (*real_ ## name)(type1); \
-    type name(type1 arg1) { \
+    HOOK_FUNC_DEF1(type, name, type1, arg1) { \
         _HOOK_PRE_FILE(type, name, file) \
         result = real_ ## name(arg1); \
         _HOOK_POST_FILE(file) \
     }
 #define HOOK_FILE2(type, name, file, type1, arg1, type2, arg2) \
-    static type (*real_ ## name)(type1, type2); \
-    type name(type1 arg1, type2 arg2) { \
+    HOOK_FUNC_DEF2(type, name, type1, arg1, type2, arg2) { \
         _HOOK_PRE_FILE(type, name, file) \
         result = real_ ## name(arg1, arg2); \
         _HOOK_POST_FILE(file) \
     }
 #define HOOK_FILE3(type, name, file, type1, arg1, type2, arg2, type3, arg3) \
-    static type (*real_ ## name)(type1, type2, type3); \
-    type name(type1 arg1, type2 arg2, type3 arg3) { \
+    HOOK_FUNC_DEF3(type, name, type1, arg1, type2, arg2, type3, arg3) { \
         _HOOK_PRE_FILE(type, name, file) \
         result = real_ ## name(arg1, arg2, arg3); \
         _HOOK_POST_FILE(file) \
     }
 #define HOOK_FILE4(type, name, file, type1, arg1, type2, arg2, type3, arg3, type4, arg4) \
-    static type (*real_ ## name)(type1, type2, type3, type4); \
-    type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4) { \
+    HOOK_FUNC_DEF4(type, name, type1, arg1, type2, arg2, type3, arg3, type4, arg4) { \
         _HOOK_PRE_FILE(type, name, file) \
         result = real_ ## name(arg1, arg2, arg3, arg4); \
         _HOOK_POST_FILE(file) \
     }
 
 #define HOOK_VAR_FILE1(type, name, file, func, type1, arg1) \
-    static type (*real_ ## func)(type1, va_list); \
-    type name(type1 arg1, ...) { \
+    HOOK_FUNC_VAR_SIMPLE1(type, name, type1, arg1) { \
         va_list ap; \
-        _HOOK_PRE_FILE(type, func, file) \
         va_start(ap, arg1); \
-        result = real_ ## func(arg1, ap); \
+        type result = func(arg1, ap); \
         va_end(ap); \
-        _HOOK_POST_FILE(file) \
+        return result; \
     }
 #define HOOK_VAR_FILE2(type, name, file, func, type1, arg1, type2, arg2) \
-    static type (*real_ ## func)(type1, type2, va_list); \
-    type name(type1 arg1, type2 arg2, ...) { \
+    HOOK_FUNC_VAR_SIMPLE2(type, name, type1, arg1, type2, arg2) { \
         va_list ap; \
-        _HOOK_PRE_FILE(type, func, file) \
         va_start(ap, arg2); \
-        result = real_ ## func(arg1, arg2, ap); \
+        type result = func(arg1, arg2, ap); \
         va_end(ap); \
-        _HOOK_POST_FILE(file) \
+        return result; \
     }
 #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, ...) \
-    { \
+    HOOK_FUNC_VAR_SIMPLE3(type, name, type1, arg1, type2, arg2, type3, arg3) { \
         va_list ap; \
-        _HOOK_PRE_FILE(type, func, file) \
         va_start(ap, arg3); \
-        result = real_ ## func(arg1, arg2, arg3, ap); \
+        type result = func(arg1, arg2, arg3, ap); \
         va_end(ap); \
-        _HOOK_POST_FILE(file) \
+        return result; \
     }
 
 #endif