X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=src%2Fcoloredstderr.c;h=c36c2f732cb409732c0da90a2f87ed10ba448b42;hb=fe3f7d4c635b265c58efd5bc420d32135ec7903e;hp=ccefdf34a31c9da821a58e868008a303e5310c14;hpb=51377106d1bd632546fa66bc27ac1a02a647f026;p=coloredstderr%2Fcoloredstderr.git

diff --git a/src/coloredstderr.c b/src/coloredstderr.c
index ccefdf3..c36c2f7 100644
--- a/src/coloredstderr.c
+++ b/src/coloredstderr.c
@@ -39,9 +39,9 @@
 
 
 /* Used by various functions, including debug(). */
-static ssize_t (*real_write)(int, const void *, size_t);
+static ssize_t (*real_write)(int, void const *, size_t);
 static int (*real_close)(int);
-static size_t (*real_fwrite)(const void *, size_t, size_t, FILE *);
+static size_t (*real_fwrite)(void const *, size_t, size_t, FILE *);
 
 /* Did we already (try to) parse the environment and setup the necessary
  * variables? */
@@ -66,7 +66,10 @@ static int check_handle_fd(int fd) {
     if (!initialized) {
         init_from_environment();
     }
-    if (tracked_fds_list_count == 0) {
+
+    /* tracked_fds_find() is most likely faster than calling isatty(),
+     * therefore check if we are tracking this file descriptor first. */
+    if (!tracked_fds_find(fd)) {
         return 0;
     }
 
@@ -76,7 +79,7 @@ static int check_handle_fd(int fd) {
         return 0;
     }
 
-    return tracked_fds_find(fd);
+    return 1;
 }
 
 static void dup_fd(int oldfd, int newfd) {
@@ -87,9 +90,6 @@ static void dup_fd(int oldfd, int newfd) {
     if (!initialized) {
         init_from_environment();
     }
-    if (tracked_fds_list_count == 0) {
-        return;
-    }
 
     /* We are already tracking this file descriptor, add newfd to the list as
      * it will reference the same descriptor. */
@@ -112,9 +112,6 @@ static void close_fd(int fd) {
     if (!initialized) {
         init_from_environment();
     }
-    if (tracked_fds_list_count == 0) {
-        return;
-    }
 
     tracked_fds_remove(fd);
 }
@@ -122,14 +119,14 @@ static void close_fd(int fd) {
 
 /* "Action" handlers called when a file descriptor is matched. */
 
-static char *pre_string;
+static char const *pre_string;
 static size_t pre_string_size;
-static char *post_string;
+static char const *post_string;
 static size_t post_string_size;
 
 /* Load alternative pre/post strings from the environment if available, fall
  * back to default values. */
-inline static void init_pre_post_string() {
+inline static void init_pre_post_string(void) {
     pre_string = getenv(ENV_NAME_PRE_STRING);
     if (!pre_string) {
         pre_string = DEFAULT_PRE_STRING;
@@ -143,9 +140,7 @@ inline static void init_pre_post_string() {
     post_string_size = strlen(post_string);
 }
 
-static void handle_fd_pre(int fd, int action) {
-    (void)action;
-
+static void handle_fd_pre(int fd) {
     if (!pre_string || !post_string) {
         init_pre_post_string();
     }
@@ -153,16 +148,12 @@ static void handle_fd_pre(int fd, int action) {
     DLSYM_FUNCTION(real_write, "write");
     real_write(fd, pre_string, pre_string_size);
 }
-static void handle_fd_post(int fd, int action) {
-    (void)action;
-
+static void handle_fd_post(int fd) {
     /* write() already loaded above in handle_fd_pre(). */
     real_write(fd, post_string, post_string_size);
 }
 
-static void handle_file_pre(FILE *stream, int action) {
-    (void)action;
-
+static void handle_file_pre(FILE *stream) {
     if (!pre_string || !post_string) {
         init_pre_post_string();
     }
@@ -170,9 +161,7 @@ static void handle_file_pre(FILE *stream, int action) {
     DLSYM_FUNCTION(real_fwrite, "fwrite");
     real_fwrite(pre_string, pre_string_size, 1, stream);
 }
-static void handle_file_post(FILE *stream, int action) {
-    (void)action;
-
+static void handle_file_post(FILE *stream) {
     /* fwrite() already loaded above in handle_file_pre(). */
     real_fwrite(post_string, post_string_size, 1, stream);
 }
@@ -182,13 +171,13 @@ static void handle_file_post(FILE *stream, int action) {
 /* Hook all important output functions to manipulate their output. */
 
 HOOK_FD3(ssize_t, write, fd,
-         int, fd, const void *, buf, size_t, count)
+         int, fd, void const *, buf, size_t, count)
 HOOK_FILE4(size_t, fwrite, stream,
-           const void *, ptr, size_t, size, size_t, nmemb, FILE *, stream)
+           void const *, ptr, size_t, size, size_t, nmemb, FILE *, stream)
 
 /* puts(3) */
 HOOK_FILE2(int, fputs, stream,
-           const char *, s, FILE *, stream)
+           char const *, s, FILE *, stream)
 HOOK_FILE2(int, fputc, stream,
            int, c, FILE *, stream)
 HOOK_FILE2(int, putc, stream,
@@ -196,51 +185,49 @@ HOOK_FILE2(int, putc, stream,
 HOOK_FILE1(int, putchar, stdout,
            int, c)
 HOOK_FILE1(int, puts, stdout,
-           const char *, s)
+           char const *, s)
 
 /* printf(3), excluding all s*() and vs*() functions (no output) */
 HOOK_VAR_FILE1(int, printf, stdout, vprintf,
-               const char *, format)
+               char const *, format)
 HOOK_VAR_FILE2(int, fprintf, stream, vfprintf,
-               FILE *, stream, const char *, format)
+               FILE *, stream, char const *, format)
 HOOK_FILE2(int, vprintf, stdout,
-           const char *, format, va_list, ap)
+           char const *, format, va_list, ap)
 HOOK_FILE3(int, vfprintf, stream,
-           FILE *, stream, const char *, format, va_list, ap)
+           FILE *, stream, char const *, format, va_list, ap)
 /* Hardening functions (-D_FORTIFY_SOURCE=2), only functions from above */
 HOOK_VAR_FILE2(int, __printf_chk, stdout, __vprintf_chk,
-               int, flag, const char *, format)
+               int, flag, char const *, format)
 HOOK_VAR_FILE3(int, __fprintf_chk, fp, __vfprintf_chk,
-               FILE *, fp, int, flag, const char *, format)
+               FILE *, fp, int, flag, char const *, format)
 HOOK_FILE3(int, __vprintf_chk, stdout,
-           int, flag, const char *, format, va_list, ap)
+           int, flag, char const *, format, va_list, ap)
 HOOK_FILE4(int, __vfprintf_chk, stream,
-           FILE *, stream, int, flag, const char *, format, va_list, ap)
+           FILE *, stream, int, flag, char const *, format, va_list, ap)
 
 /* unlocked_stdio(3), only functions from above are hooked */
 HOOK_FILE4(size_t, fwrite_unlocked, stream,
-           const void *, ptr, size_t, size, size_t, nmemb, FILE *, stream)
+           void const *, ptr, size_t, size, size_t, nmemb, FILE *, stream)
 HOOK_FILE2(int, fputs_unlocked, stream,
-           const char *, s, FILE *, stream)
+           char const *, s, FILE *, stream)
 HOOK_FILE2(int, fputc_unlocked, stream,
            int, c, FILE *, stream)
 HOOK_FILE2(int, putc_unlocked, stream,
            int, c, FILE *, stream)
 HOOK_FILE1(int, putchar_unlocked, stdout,
            int, c)
-HOOK_FILE1(int, puts_unlocked, stdout,
-           const char *, s)
 
 /* perror(3) */
 HOOK_VOID1(void, perror, STDERR_FILENO,
-           const char *, s)
+           char const *, s)
 
 /* error(3) */
 #ifdef HAVE_ERROR_H
 static void  error_vararg(int status, int errnum,
-                   const char *filename, unsigned int linenum,
-                   const char *format, va_list ap) {
-    static const char *last_filename;
+                   char const *filename, unsigned int linenum,
+                   char const *format, va_list ap) {
+    static char const *last_filename;
     static unsigned int last_linenum;
 
     /* Skip this error message if requested and if there was already an error
@@ -286,15 +273,15 @@ static void  error_vararg(int status, int errnum,
     }
 }
 void error_at_line(int status, int errnum,
-                   const char *filename, unsigned int linenum,
-                   const char *format, ...) {
+                   char const *filename, unsigned int linenum,
+                   char const *format, ...) {
     va_list ap;
 
     va_start(ap, format);
     error_vararg(status, errnum, filename, linenum, format, ap);
     va_end(ap);
 }
-void error(int status, int errnum, const char *format, ...) {
+void error(int status, int errnum, char const *format, ...) {
     va_list ap;
 
     va_start(ap, format);
@@ -423,8 +410,8 @@ pid_t vfork(void) {
  * ENV_NAME_FDS. It's also faster to update the environment only when
  * necessary, right before the exec() to pass it to the new process. */
 
-static int (*real_execve)(const char *filename, char *const argv[], char *const env[]);
-int execve(const char *filename, char *const argv[], char *const env[]) {
+static int (*real_execve)(char const *filename, char * const argv[], char * const env[]);
+int execve(char const *filename, char * const argv[], char * const env[]) {
     DLSYM_FUNCTION(real_execve, "execve");
 
     int found = 0;
@@ -479,7 +466,7 @@ int execve(const char *filename, char *const argv[], char *const env[]) {
     /* Count arguments. */ \
     size_t count = 1; /* arg */ \
     va_start(ap, arg); \
-    while (va_arg(ap, const char *)) { \
+    while (va_arg(ap, char const *)) { \
         count++; \
     } \
     va_end(ap); \
@@ -500,21 +487,21 @@ int execve(const char *filename, char *const argv[], char *const env[]) {
     EXECL_COPY_VARARGS_START(args); \
     EXECL_COPY_VARARGS_END(args);
 
-int execl(const char *path, const char *arg, ...) {
+int execl(char const *path, char const *arg, ...) {
     EXECL_COPY_VARARGS(args);
 
     update_environment();
     return execv(path, args);
 }
 
-int execlp(const char *file, const char *arg, ...) {
+int execlp(char const *file, char const *arg, ...) {
     EXECL_COPY_VARARGS(args);
 
     update_environment();
     return execvp(file, args);
 }
 
-int execle(const char *path, const char *arg, ... /*, char *const envp[] */) {
+int execle(char const *path, char const *arg, ... /*, char * const envp[] */) {
     EXECL_COPY_VARARGS_START(args);
     /* Get envp[] located after arguments. */
     char * const *envp = va_arg(ap, char * const *);
@@ -523,16 +510,16 @@ int execle(const char *path, const char *arg, ... /*, char *const envp[] */) {
     return execve(path, args, envp);
 }
 
-static int (*real_execv)(const char *path, char *const argv[]);
-int execv(const char *path, char *const argv[]) {
+static int (*real_execv)(char const *path, char * const argv[]);
+int execv(char const *path, char * const argv[]) {
     DLSYM_FUNCTION(real_execv, "execv");
 
     update_environment();
     return real_execv(path, argv);
 }
 
-static int (*real_execvp)(const char *path, char *const argv[]);
-int execvp(const char *path, char *const argv[]) {
+static int (*real_execvp)(char const *path, char * const argv[]);
+int execvp(char const *path, char * const argv[]) {
     DLSYM_FUNCTION(real_execvp, "execvp");
 
     update_environment();