Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Mentioned the zlib changes and tweaked a couple sentences.
[rsync/rsync.git]
/
pipe.c
diff --git
a/pipe.c
b/pipe.c
index
446afa7
..
0130608
100644
(file)
--- a/
pipe.c
+++ b/
pipe.c
@@
-25,7
+25,6
@@
extern int am_sender;
extern int am_server;
extern int blocking_io;
extern int orig_umask;
extern int am_server;
extern int blocking_io;
extern int orig_umask;
-extern int write_batch;
extern int filesfrom_fd;
/**
extern int filesfrom_fd;
/**
@@
-79,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);
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);
}
exit_cleanup(RERR_IPC);
}
@@
-127,10
+127,6
@@
pid_t local_child(int argc, char **argv, int *f_in, int *f_out,
am_sender = !am_sender;
am_server = 1;
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;
if (!am_sender)
filesfrom_fd = -1;