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
Document the new "incoming chmod" config option.
[rsync/rsync.git]
/
pipe.c
diff --git
a/pipe.c
b/pipe.c
index
941e5d8
..
da1b4de
100644
(file)
--- a/
pipe.c
+++ b/
pipe.c
@@
-25,11
+25,11
@@
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;
+extern struct chmod_mode_struct *chmod_modes;
/**
/**
- * Create a child connected to us
e on
stdin/stdout.
+ * Create a child connected to us
via its
stdin/stdout.
*
* This is derived from CVS code
*
*
* This is derived from CVS code
*
@@
-79,8
+79,7
@@
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",
- safe_fname(command[0]));
+ rsyserr(FERROR, errno, "Failed to exec %s", command[0]);
exit_cleanup(RERR_IPC);
}
exit_cleanup(RERR_IPC);
}
@@
-112,6
+111,9
@@
pid_t local_child(int argc, char **argv, int *f_in, int *f_out,
int to_child_pipe[2];
int from_child_pipe[2];
int to_child_pipe[2];
int from_child_pipe[2];
+ /* The parent process is always the sender for a local rsync. */
+ assert(am_sender);
+
if (fd_pair(to_child_pipe) < 0 ||
fd_pair(from_child_pipe) < 0) {
rsyserr(FERROR, errno, "pipe");
if (fd_pair(to_child_pipe) < 0 ||
fd_pair(from_child_pipe) < 0) {
rsyserr(FERROR, errno, "pipe");
@@
-125,15
+127,10
@@
pid_t local_child(int argc, char **argv, int *f_in, int *f_out,
}
if (pid == 0) {
}
if (pid == 0) {
- am_sender =
!am_sender
;
+ am_sender =
0
;
am_server = 1;
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;
+ filesfrom_fd = -1;
+ chmod_modes = NULL; /* Let the sending side handle this. */
if (dup2(to_child_pipe[0], STDIN_FILENO) < 0 ||
close(to_child_pipe[1]) < 0 ||
if (dup2(to_child_pipe[0], STDIN_FILENO) < 0 ||
close(to_child_pipe[1]) < 0 ||
@@
-149,9
+146,6
@@
pid_t local_child(int argc, char **argv, int *f_in, int *f_out,
child_main(argc, argv);
}
child_main(argc, argv);
}
- if (!am_sender)
- filesfrom_fd = -1;
-
if (close(from_child_pipe[1]) < 0 ||
close(to_child_pipe[0]) < 0) {
rsyserr(FERROR, errno, "Failed to close");
if (close(from_child_pipe[1]) < 0 ||
close(to_child_pipe[0]) < 0) {
rsyserr(FERROR, errno, "Failed to close");