Changed rprintf() calls that included strerror() to use rsyserr().

[rsync/rsync.git] / pipe.c

diff --git a/pipe.c b/pipe.c
index 59a0d76..18e9a72 100644 (file)
--- a/pipe.c
+++ b/pipe.c
@@ -21,6 +21,13 @@
 
 #include "rsync.h"
 
+extern int am_sender;
+extern int am_server;
+extern int blocking_io;
+extern int orig_umask;
+extern int read_batch;
+extern int filesfrom_fd;
+
 /**
  * Create a child connected to use on stdin/stdout.
  *
@@ -39,32 +46,29 @@ pid_t piped_child(char **command, int *f_in, int *f_out)
        pid_t pid;
        int to_child_pipe[2];
        int from_child_pipe[2];
-       extern int blocking_io;
        
        if (verbose >= 2) {
                print_child_argv(command);
        }
 
        if (fd_pair(to_child_pipe) < 0 || fd_pair(from_child_pipe) < 0) {
-               rprintf(FERROR, "pipe: %s\n", strerror(errno));
+               rsyserr(FERROR, errno, "pipe");
                exit_cleanup(RERR_IPC);
        }
 
 
        pid = do_fork();
        if (pid == -1) {
-               rprintf(FERROR, "fork: %s\n", strerror(errno));
+               rsyserr(FERROR, errno, "fork");
                exit_cleanup(RERR_IPC);
        }
 
        if (pid == 0) {
-               extern int orig_umask;
                if (dup2(to_child_pipe[0], STDIN_FILENO) < 0 ||
                    close(to_child_pipe[1]) < 0 ||
                    close(from_child_pipe[0]) < 0 ||
                    dup2(from_child_pipe[1], STDOUT_FILENO) < 0) {
-                       rprintf(FERROR, "Failed to dup/close : %s\n",
-                               strerror(errno));
+                       rsyserr(FERROR, errno, "Failed to dup/close");
                        exit_cleanup(RERR_IPC);
                }
                if (to_child_pipe[0] != STDIN_FILENO)
@@ -73,17 +77,15 @@ pid_t piped_child(char **command, int *f_in, int *f_out)
                        close(from_child_pipe[1]);
                umask(orig_umask);
                set_blocking(STDIN_FILENO);
-               if (blocking_io) {
+               if (blocking_io > 0)
                        set_blocking(STDOUT_FILENO);
-               }
                execvp(command[0], command);
-               rprintf(FERROR, "Failed to exec %s : %s\n",
-                       command[0], strerror(errno));
+               rsyserr(FERROR, errno, "Failed to exec %s", command[0]);
                exit_cleanup(RERR_IPC);
        }
 
        if (close(from_child_pipe[1]) < 0 || close(to_child_pipe[0]) < 0) {
-               rprintf(FERROR, "Failed to close : %s\n", strerror(errno));
+               rsyserr(FERROR, errno, "Failed to close");
                exit_cleanup(RERR_IPC);
        }
 
@@ -99,21 +101,17 @@ pid_t local_child(int argc, char **argv,int *f_in,int *f_out,
        pid_t pid;
        int to_child_pipe[2];
        int from_child_pipe[2];
-       extern int read_batch;
-       extern int am_sender;
-       extern int am_server;
-       extern int filesfrom_fd;
 
        if (fd_pair(to_child_pipe) < 0 ||
            fd_pair(from_child_pipe) < 0) {
-               rprintf(FERROR,"pipe: %s\n",strerror(errno));
+               rsyserr(FERROR, errno, "pipe");
                exit_cleanup(RERR_IPC);
        }
 
 
        pid = do_fork();
        if (pid == -1) {
-               rprintf(FERROR,"fork: %s\n",strerror(errno));
+               rsyserr(FERROR, errno, "fork");
                exit_cleanup(RERR_IPC);
        }
 
@@ -128,7 +126,7 @@ pid_t local_child(int argc, char **argv,int *f_in,int *f_out,
                    close(to_child_pipe[1]) < 0 ||
                    close(from_child_pipe[0]) < 0 ||
                    dup2(from_child_pipe[1], STDOUT_FILENO) < 0) {
-                       rprintf(FERROR,"Failed to dup/close : %s\n",strerror(errno));
+                       rsyserr(FERROR, errno, "Failed to dup/close");
                        exit_cleanup(RERR_IPC);
                }
                if (to_child_pipe[0] != STDIN_FILENO) close(to_child_pipe[0]);
@@ -141,7 +139,7 @@ pid_t local_child(int argc, char **argv,int *f_in,int *f_out,
 
        if (close(from_child_pipe[1]) < 0 ||
            close(to_child_pipe[0]) < 0) {
-               rprintf(FERROR,"Failed to close : %s\n",strerror(errno));   
+               rsyserr(FERROR, errno, "Failed to close");   
                exit_cleanup(RERR_IPC);
        }