X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/8c90957ff59a6030160676208f6c89c5476cb30f..37802f40dcbe8956ba8ee3bfbddf10c60f94c209:/pipe.c diff --git a/pipe.c b/pipe.c index 2225cc6d..941e5d87 100644 --- a/pipe.c +++ b/pipe.c @@ -79,7 +79,8 @@ pid_t piped_child(char **command, int *f_in, int *f_out) if (blocking_io > 0) set_blocking(STDOUT_FILENO); execvp(command[0], command); - rsyserr(FERROR, errno, "Failed to exec %s", command[0]); + rsyserr(FERROR, errno, "Failed to exec %s", + safe_fname(command[0])); exit_cleanup(RERR_IPC); } @@ -94,8 +95,7 @@ pid_t piped_child(char **command, int *f_in, int *f_out) return pid; } -/* - * This function forks a child which calls child_main(). First, +/* This function forks a child which calls child_main(). First, * however, it has to establish communication paths to and from the * newborn child. It creates two socket pairs -- one for writing to * the child (from the parent) and one for reading from the child @@ -104,8 +104,7 @@ pid_t piped_child(char **command, int *f_in, int *f_out) * two socket ends are retained for reading and writing. In the * child, the STDIN and STDOUT file descriptors refer to these * sockets. In the parent, the function arguments f_in and f_out are - * set to refer to these sockets. - */ + * set to refer to these sockets. */ pid_t local_child(int argc, char **argv, int *f_in, int *f_out, int (*child_main)(int, char*[])) { @@ -119,9 +118,7 @@ pid_t local_child(int argc, char **argv, int *f_in, int *f_out, exit_cleanup(RERR_IPC); } - /* For read-batch, don't even fork. */ pid = do_fork(); - if (pid == -1) { rsyserr(FERROR, errno, "fork"); exit_cleanup(RERR_IPC);