X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/b9f592fbf50b0dc9e3d1d33b8deb2bf9abad9ef6..5918daf8a42a80bb9db3c787dffd8dead4bcca9f:/pipe.c

diff --git a/pipe.c b/pipe.c
index 90c7679f..01306088 100644
--- a/pipe.c
+++ b/pipe.c
@@ -25,8 +25,6 @@ extern int am_sender;
 extern int am_server;
 extern int blocking_io;
 extern int orig_umask;
-extern int read_batch;
-extern int write_batch;
 extern int filesfrom_fd;
 
 /**
@@ -80,7 +78,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);
 	}
 
@@ -95,8 +94,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
@@ -105,8 +103,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*[]))
 {
@@ -120,9 +117,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 = read_batch ? getpid() : do_fork();
-
+	pid = do_fork();
 	if (pid == -1) {
 		rsyserr(FERROR, errno, "fork");
 		exit_cleanup(RERR_IPC);
@@ -132,10 +127,6 @@ pid_t local_child(int argc, char **argv, int *f_in, int *f_out,
 		am_sender = !am_sender;
 		am_server = 1;
 
-		/* The server side never writes the batch, even if it
-		 * is local (it makes the logic easier elsewhere). */
-		write_batch = 0;
-
 		if (!am_sender)
 			filesfrom_fd = -1;