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
Fixed some typos, got rid of some extraneous spaces, got rid of
[rsync/rsync.git]
/
pipe.c
diff --git
a/pipe.c
b/pipe.c
index
90c7679
..
da1b4de
100644
(file)
--- a/
pipe.c
+++ b/
pipe.c
@@
-25,12
+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 read_batch;
-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
*
@@
-95,8
+94,7
@@
pid_t piped_child(char **command, int *f_in, int *f_out)
return pid;
}
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
* 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
* 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*[]))
{
pid_t local_child(int argc, char **argv, int *f_in, int *f_out,
int (*child_main)(int, char*[]))
{
@@
-114,30
+111,26
@@
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");
exit_cleanup(RERR_IPC);
}
if (fd_pair(to_child_pipe) < 0 ||
fd_pair(from_child_pipe) < 0) {
rsyserr(FERROR, errno, "pipe");
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);
}
if (pid == 0) {
if (pid == -1) {
rsyserr(FERROR, errno, "fork");
exit_cleanup(RERR_IPC);
}
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 ||
@@
-153,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");