diff options
| author | Wayne Davison <wayned@samba.org> | 2003-03-30 23:00:33 +0000 |
|---|---|---|
| committer | Wayne Davison <wayned@samba.org> | 2003-03-30 23:00:33 +0000 |
| commit | 7c2a9e766c0e162773b291b916521297f24d57c4 (patch) | |
| tree | e9481ccaa1f2a8cad3f72c3f3e3879db57c9a42a /pipe.c | |
| parent | bb24028f51bac18097e688c1459924f648bc407e (diff) | |
| download | android_external_rsync-7c2a9e766c0e162773b291b916521297f24d57c4.tar.gz android_external_rsync-7c2a9e766c0e162773b291b916521297f24d57c4.tar.bz2 android_external_rsync-7c2a9e766c0e162773b291b916521297f24d57c4.zip | |
Support the new --files-from option.
Diffstat (limited to 'pipe.c')
| -rw-r--r-- | pipe.c | 16 |
1 files changed, 10 insertions, 6 deletions
@@ -99,7 +99,10 @@ pid_t local_child(int argc, char **argv,int *f_in,int *f_out, pid_t pid; int to_child_pipe[2]; int from_child_pipe[2]; - extern int read_batch; /* dw */ + extern int read_batch; + extern int am_sender; + extern int am_server; + extern int filesfrom_fd; if (fd_pair(to_child_pipe) < 0 || fd_pair(from_child_pipe) < 0) { @@ -115,12 +118,12 @@ pid_t local_child(int argc, char **argv,int *f_in,int *f_out, } if (pid == 0) { - extern int am_sender; - extern int am_server; - am_sender = read_batch ? 0 : !am_sender; am_server = 1; + if (!am_sender) + filesfrom_fd = -1; + if (dup2(to_child_pipe[0], STDIN_FILENO) < 0 || close(to_child_pipe[1]) < 0 || close(from_child_pipe[0]) < 0 || @@ -133,6 +136,9 @@ pid_t local_child(int argc, char **argv,int *f_in,int *f_out, child_main(argc, argv); } + if (!am_sender) + filesfrom_fd = -1; + if (close(from_child_pipe[1]) < 0 || close(to_child_pipe[0]) < 0) { rprintf(FERROR,"Failed to close : %s\n",strerror(errno)); @@ -144,5 +150,3 @@ pid_t local_child(int argc, char **argv,int *f_in,int *f_out, return pid; } - - |