Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
c0f4228
)
Fixed local_child() so that the client side really does handle
author
Wayne Davison
<wayned@samba.org>
Mon, 4 Feb 2008 20:52:41 +0000
(12:52 -0800)
committer
Wayne Davison
<wayned@samba.org>
Mon, 4 Feb 2008 20:52:41 +0000
(12:52 -0800)
the log-file writing.
pipe.c
patch
|
blob
|
blame
|
history
diff --git
a/pipe.c
b/pipe.c
index
12aa73d
..
5445811
100644
(file)
--- 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. */
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 ||
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);
}
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");
if (close(from_child_pipe[1]) < 0 ||
close(to_child_pipe[0]) < 0) {
rsyserr(FERROR, errno, "Failed to close");