X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=src%2Fcoloredstderr.c;h=eb9d92cc3c1148d6160e87c4aade4171d8fd2c91;hb=1068648718dad86471451266fcdf4248bb79f3fe;hp=8775541a61e8c6b42d871b0c8cf78628d31f6a0f;hpb=dfd317650f05542db49d7bc37649a232f28efa3f;p=coloredstderr%2Fcoloredstderr.git diff --git a/src/coloredstderr.c b/src/coloredstderr.c index 8775541..eb9d92c 100644 --- a/src/coloredstderr.c +++ b/src/coloredstderr.c @@ -20,9 +20,17 @@ #include +#include "compiler.h" + /* Must be loaded before the following headers. */ #include "ldpreload.h" +/* Disable assert()s if not compiled with --enable-debug. */ +#ifndef DEBUG +# define NDEBUG +#endif + +#include #include #include #include @@ -33,9 +41,17 @@ #ifdef HAVE_ERROR_H # include #endif +#ifdef HAVE_STRUCT__IO_FILE__FILENO +# include +#endif /* Conflicting declaration in glibc. */ #undef fwrite_unlocked +/* These functions may be macros when compiling with hardening flags (fortify) + * which cause build failures when used in our hook macros below. Observed + * with Clang on Debian Wheezy. */ +#undef printf +#undef fprintf /* Used by various functions, including debug(). */ @@ -51,7 +67,7 @@ static int force_write_to_non_tty; #include "constants.h" -#ifdef DEBUG +#ifdef WARNING # include "debug.h" #endif @@ -60,24 +76,15 @@ static int force_write_to_non_tty; -/* Should the "action" handler be invoked for this file descriptor? */ -static int check_handle_fd(int fd) { - /* Load state from environment. Only necessary once per process. */ - if (!initialized) { - init_from_environment(); - } +/* See hookmacros.h for the decision if a function call is colored. */ - /* 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; - } - /* Never touch anything not going to a terminal - unless we are explicitly - * asked to do so. */ - if (force_write_to_non_tty) { - return 1; - } +/* Prevent inlining into hook functions because it may increase the number of + * spilled registers unnecessarily. As it's not called very often accept the + * additional call. */ +static int isatty_noinline(int fd) noinline; +static int isatty_noinline(int fd) { + assert(fd >= 0); int saved_errno = errno; int result = isatty(fd); @@ -86,12 +93,15 @@ static int check_handle_fd(int fd) { return result; } + static void dup_fd(int oldfd, int newfd) { #ifdef DEBUG debug("%3d -> %3d\t\t\t[%d]\n", oldfd, newfd, getpid()); #endif - if (!initialized) { + assert(oldfd >= 0 && newfd >= 0); + + if (unlikely(!initialized)) { init_from_environment(); } @@ -113,7 +123,9 @@ static void close_fd(int fd) { debug("%3d -> .\t\t\t[%d]\n", fd, getpid()); #endif - if (!initialized) { + assert(fd >= 0); + + if (unlikely(!initialized)) { init_from_environment(); } @@ -130,7 +142,7 @@ 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(void) { +static void init_pre_post_string(void) { pre_string = getenv(ENV_NAME_PRE_STRING); if (!pre_string) { pre_string = DEFAULT_PRE_STRING; @@ -144,10 +156,17 @@ inline static void init_pre_post_string(void) { post_string_size = strlen(post_string); } +/* Don't inline any of the pre/post functions. Keep the hook function as small + * as possible for speed reasons. */ +static void handle_fd_pre(int fd) noinline; +static void handle_fd_post(int fd) noinline; +static void handle_file_pre(FILE *stream) noinline; +static void handle_file_post(FILE *stream) noinline; + static void handle_fd_pre(int fd) { int saved_errno = errno; - if (!pre_string || !post_string) { + if (unlikely(!pre_string || !post_string)) { init_pre_post_string(); } @@ -168,7 +187,7 @@ static void handle_fd_post(int fd) { static void handle_file_pre(FILE *stream) { int saved_errno = errno; - if (!pre_string || !post_string) { + if (unlikely(!pre_string || !post_string)) { init_pre_post_string(); } @@ -237,16 +256,20 @@ HOOK_FILE2(int, putc_unlocked, stream, int, c, FILE *, stream) HOOK_FILE1(int, putchar_unlocked, stdout, int, c) +/* glibc defines (_IO_)putc_unlocked() to __overflow() in some cases. */ +#ifdef HAVE_STRUCT__IO_FILE__FILENO +HOOK_FD2(int, __overflow, f->_fileno, _IO_FILE *, f, int, ch) +#endif /* perror(3) */ HOOK_VOID1(void, perror, STDERR_FILENO, char const *, s) -/* error(3) */ +/* error(3), non-standard GNU extension */ #ifdef HAVE_ERROR_H -static void error_vararg(int status, int errnum, - char const *filename, unsigned int linenum, - char const *format, va_list ap) { +static void error_vararg(int status, int errnum, + char const *filename, unsigned int linenum, + char const *format, va_list ap) { static char const *last_filename; static unsigned int last_linenum; @@ -313,10 +336,8 @@ void error(int status, int errnum, char const *format, ...) { /* Hook functions which duplicate file descriptors to track them. */ -static int (*real_dup)(int); -static int (*real_dup2)(int, int); -static int (*real_dup3)(int, int, int); -int dup(int oldfd) { +/* int dup(int) */ +HOOK_FUNC_DEF1(int, dup, int, oldfd) { int newfd; DLSYM_FUNCTION(real_dup, "dup"); @@ -328,7 +349,8 @@ int dup(int oldfd) { return newfd; } -int dup2(int oldfd, int newfd) { +/* int dup2(int, int) */ +HOOK_FUNC_DEF2(int, dup2, int, oldfd, int, newfd) { DLSYM_FUNCTION(real_dup2, "dup2"); newfd = real_dup2(oldfd, newfd); @@ -338,7 +360,8 @@ int dup2(int oldfd, int newfd) { return newfd; } -int dup3(int oldfd, int newfd, int flags) { +/* int dup3(int, int, int) */ +HOOK_FUNC_DEF3(int, dup3, int, oldfd, int, newfd, int, flags) { DLSYM_FUNCTION(real_dup3, "dup3"); newfd = real_dup3(oldfd, newfd, flags); @@ -349,8 +372,8 @@ int dup3(int oldfd, int newfd, int flags) { return newfd; } -static int (*real_fcntl)(int, int, ...); -int fcntl(int fd, int cmd, ...) { +/* int fcntl(int, int, ...) */ +HOOK_FUNC_VAR_DEF2(int, fcntl, int, fd, int, cmd /*, ... */) { int result; va_list ap; @@ -381,18 +404,24 @@ int fcntl(int fd, int cmd, ...) { return result; } -static int (*real_close)(int); -int close(int fd) { +/* int close(int) */ +HOOK_FUNC_DEF1(int, close, int, fd) { DLSYM_FUNCTION(real_close, "close"); - close_fd(fd); + if (fd >= 0) { + close_fd(fd); + } return real_close(fd); } -static int (*real_fclose)(FILE *); -int fclose(FILE *fp) { +/* int fclose(FILE *) */ +HOOK_FUNC_DEF1(int, fclose, FILE *, fp) { + int fd; + DLSYM_FUNCTION(real_fclose, "fclose"); - close_fd(fileno(fp)); + if (fp != NULL && (fd = fileno(fp)) >= 0) { + close_fd(fd); + } return real_fclose(fp); } @@ -422,8 +451,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)(char const *filename, char * const argv[], char * const env[]); -int execve(char const *filename, char * const argv[], char * const env[]) { +/* int execve(char const *, char * const [], char * const []) */ +HOOK_FUNC_DEF3(int, execve, char const *, filename, char * const *, argv, char * const *, env) { DLSYM_FUNCTION(real_execve, "execve"); int found = 0; @@ -478,14 +507,14 @@ int execve(char const *filename, char * const argv[], char * const env[]) { /* Count arguments. */ \ size_t count = 1; /* arg */ \ va_start(ap, arg); \ - while (va_arg(ap, char const *)) { \ + while (va_arg(ap, char *)) { \ count++; \ } \ va_end(ap); \ \ /* Copy varargs. */ \ char *args[count + 1 /* terminating NULL */]; \ - args[0] = (char *)arg; \ + args[0] = (char *)arg; /* there's no other way around the cast */ \ \ size_t i = 1; \ va_start(ap, arg); \ @@ -502,38 +531,50 @@ int execve(char const *filename, char * const argv[], char * const env[]) { int execl(char const *path, char const *arg, ...) { EXECL_COPY_VARARGS(args); - update_environment(); + /* execv() updates the environment. */ return execv(path, args); } - int execlp(char const *file, char const *arg, ...) { EXECL_COPY_VARARGS(args); - update_environment(); + /* execvp() updates the environment. */ return execvp(file, args); } - int execle(char const *path, char const *arg, ... /*, char * const envp[] */) { + char * const *envp; + EXECL_COPY_VARARGS_START(args); /* Get envp[] located after arguments. */ - char * const *envp = va_arg(ap, char * const *); + envp = va_arg(ap, char * const *); EXECL_COPY_VARARGS_END(args); + /* execve() updates the environment. */ return execve(path, args, envp); } -static int (*real_execv)(char const *path, char * const argv[]); -int execv(char const *path, char * const argv[]) { +/* int execv(char const *, char * const []) */ +HOOK_FUNC_DEF2(int, execv, char const *, path, char * const *, argv) { DLSYM_FUNCTION(real_execv, "execv"); update_environment(); return real_execv(path, argv); } -static int (*real_execvp)(char const *path, char * const argv[]); -int execvp(char const *path, char * const argv[]) { +/* int execvp(char const *, char * const []) */ +HOOK_FUNC_DEF2(int, execvp, char const *, file, char * const *, argv) { DLSYM_FUNCTION(real_execvp, "execvp"); update_environment(); - return real_execvp(path, argv); + return real_execvp(file, argv); } + +#ifdef HAVE_EXECVPE +extern char **environ; +int execvpe(char const *file, char * const argv[], char * const envp[]) { + /* Fake the environment so we can reuse execvp(). */ + environ = (char **)envp; + + /* execvp() updates the environment. */ + return execvp(file, argv); +} +#endif