aboutsummaryrefslogtreecommitdiffstats
path: root/pipe.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2008-02-04 12:52:41 -0800
committerWayne Davison <wayned@samba.org>2008-02-04 12:52:41 -0800
commitddc8110dea7ee78eb03855854497076cefe7284d (patch)
treed7c5cb7255e287d66a2b577604917736d0830942 /pipe.c
parentc0f4228d6689a7c359327226776f421194c36cfa (diff)
downloadandroid_external_rsync-ddc8110dea7ee78eb03855854497076cefe7284d.tar.gz
android_external_rsync-ddc8110dea7ee78eb03855854497076cefe7284d.tar.bz2
android_external_rsync-ddc8110dea7ee78eb03855854497076cefe7284d.zip
Fixed local_child() so that the client side really does handle
the log-file writing.
Diffstat (limited to 'pipe.c')
-rw-r--r--pipe.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/pipe.c b/pipe.c
index 12aa73d7..54458118 100644
--- a/pipe.c
+++ b/pipe.c
@@ -133,6 +133,12 @@ pid_t local_child(int argc, char **argv, int *f_in, int *f_out,
filesfrom_fd = -1;
chmod_modes = NULL; /* Let the sending side handle this. */
+ /* Let the client side handle this. */
+ if (logfile_name) {
+ logfile_name = NULL;
+ logfile_close();
+ }
+
if (dup2(to_child_pipe[0], STDIN_FILENO) < 0 ||
close(to_child_pipe[1]) < 0 ||
close(from_child_pipe[0]) < 0 ||
@@ -150,12 +156,6 @@ pid_t local_child(int argc, char **argv, int *f_in, int *f_out,
child_main(argc, argv);
}
- /* Let the client side handle this. */
- if (logfile_name) {
- logfile_name = NULL;
- logfile_close();
- }
-
if (close(from_child_pipe[1]) < 0 ||
close(to_child_pipe[0]) < 0) {
rsyserr(FERROR, errno, "Failed to close");