X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=src%2Fcoloredstderr.c;h=a55ce38d15fd67dcc3abcc787f3cf6a1de608003;hb=a9db9083b6fd9c1bd6a09df6d64386d806488f7c;hp=c1522186592a91bbfece42a510c5e77018d9257b;hpb=7c5d6fce3a6f52243948e3eae452acb968d78469;p=coloredstderr%2Fcoloredstderr.git diff --git a/src/coloredstderr.c b/src/coloredstderr.c index c152218..a55ce38 100644 --- a/src/coloredstderr.c +++ b/src/coloredstderr.c @@ -77,7 +77,7 @@ static int check_handle_fd(int fd) { static void dup_fd(int oldfd, int newfd) { #ifdef DEBUG - debug("%d -> %d\t\t\t[%d]\n", oldfd, newfd, getpid()); + debug("%3d -> %3d\t\t\t[%d]\n", oldfd, newfd, getpid()); #endif if (!initialized) { @@ -105,7 +105,7 @@ static void dup_fd(int oldfd, int newfd) { static void close_fd(int fd) { #ifdef DEBUG - debug("%d -> .\t\t\t[%d]\n", fd, getpid()); + debug("%3d -> .\t\t\t[%d]\n", fd, getpid()); #endif if (!initialized) { @@ -206,7 +206,7 @@ HOOK_FILE2(int, vprintf, stdout, const char *, format, va_list, ap) HOOK_FILE3(int, vfprintf, stream, FILE *, stream, const char *, format, va_list, ap) -/* Hardening functions (-D_FORTIFY_SOURCE=2). */ +/* Hardening functions (-D_FORTIFY_SOURCE=2), only functions from above */ HOOK_VAR_FILE2(int, __printf_chk, stdout, __vprintf_chk, int, flag, const char *, format) HOOK_VAR_FILE3(int, __fprintf_chk, fp, __vfprintf_chk, @@ -302,6 +302,7 @@ int fcntl(int fd, int cmd, ...) { va_start(ap, cmd); result = real_fcntl(fd, cmd, va_arg(ap, void *)); va_end(ap); + /* We only care about duping fds. */ if (cmd == F_DUPFD && result != -1) { int saved_errno = errno;