X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=src%2Fcoloredstderr.c;h=8775541a61e8c6b42d871b0c8cf78628d31f6a0f;hb=dfd317650f05542db49d7bc37649a232f28efa3f;hp=44726899e4fb7590345d0890410cc6ee57abf3ca;hpb=31a1fdf921bf767154470e94f0f28c299d56cd5a;p=coloredstderr%2Fcoloredstderr.git

diff --git a/src/coloredstderr.c b/src/coloredstderr.c
index 4472689..8775541 100644
--- a/src/coloredstderr.c
+++ b/src/coloredstderr.c
@@ -75,11 +75,15 @@ static int check_handle_fd(int fd) {
 
     /* Never touch anything not going to a terminal - unless we are explicitly
      * asked to do so. */
-    if (!force_write_to_non_tty && !isatty(fd)) {
-        return 0;
+    if (force_write_to_non_tty) {
+        return 1;
     }
 
-    return 1;
+    int saved_errno = errno;
+    int result = isatty(fd);
+    errno = saved_errno;
+
+    return result;
 }
 
 static void dup_fd(int oldfd, int newfd) {
@@ -119,14 +123,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;
@@ -140,8 +144,8 @@ 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) {
+    int saved_errno = errno;
 
     if (!pre_string || !post_string) {
         init_pre_post_string();
@@ -149,16 +153,20 @@ static void handle_fd_pre(int fd, int action) {
 
     DLSYM_FUNCTION(real_write, "write");
     real_write(fd, pre_string, pre_string_size);
+
+    errno = saved_errno;
 }
-static void handle_fd_post(int fd, int action) {
-    (void)action;
+static void handle_fd_post(int fd) {
+    int saved_errno = errno;
 
     /* write() already loaded above in handle_fd_pre(). */
     real_write(fd, post_string, post_string_size);
+
+    errno = saved_errno;
 }
 
-static void handle_file_pre(FILE *stream, int action) {
-    (void)action;
+static void handle_file_pre(FILE *stream) {
+    int saved_errno = errno;
 
     if (!pre_string || !post_string) {
         init_pre_post_string();
@@ -166,12 +174,16 @@ static void handle_file_pre(FILE *stream, int action) {
 
     DLSYM_FUNCTION(real_fwrite, "fwrite");
     real_fwrite(pre_string, pre_string_size, 1, stream);
+
+    errno = saved_errno;
 }
-static void handle_file_post(FILE *stream, int action) {
-    (void)action;
+static void handle_file_post(FILE *stream) {
+    int saved_errno = errno;
 
     /* fwrite() already loaded above in handle_file_pre(). */
     real_fwrite(post_string, post_string_size, 1, stream);
+
+    errno = saved_errno;
 }
 
 
@@ -225,8 +237,6 @@ HOOK_FILE2(int, putc_unlocked, stream,
            int, c, FILE *, stream)
 HOOK_FILE1(int, putchar_unlocked, stdout,
            int, c)
-HOOK_FILE1(int, puts_unlocked, stdout,
-           char const *, s)
 
 /* perror(3) */
 HOOK_VOID1(void, perror, STDERR_FILENO,
@@ -313,9 +323,7 @@ int dup(int oldfd) {
 
     newfd = real_dup(oldfd);
     if (newfd != -1) {
-        int saved_errno = errno;
         dup_fd(oldfd, newfd);
-        errno = saved_errno;
     }
 
     return newfd;
@@ -325,9 +333,7 @@ int dup2(int oldfd, int newfd) {
 
     newfd = real_dup2(oldfd, newfd);
     if (newfd != -1) {
-        int saved_errno = errno;
         dup_fd(oldfd, newfd);
-        errno = saved_errno;
     }
 
     return newfd;
@@ -337,9 +343,7 @@ int dup3(int oldfd, int newfd, int flags) {
 
     newfd = real_dup3(oldfd, newfd, flags);
     if (newfd != -1) {
-        int saved_errno = errno;
         dup_fd(oldfd, newfd);
-        errno = saved_errno;
     }
 
     return newfd;
@@ -371,9 +375,7 @@ int fcntl(int fd, int cmd, ...) {
 
     /* We only care about duping fds. */
     if (cmd == F_DUPFD && result != -1) {
-        int saved_errno = errno;
         dup_fd(fd, result);
-        errno = saved_errno;
     }
 
     return result;
@@ -476,7 +478,7 @@ 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, const char *)) { \
+    while (va_arg(ap, char const *)) { \
         count++; \
     } \
     va_end(ap); \