X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/44c4492acfc8ff6c48b5848c2a34acd6be50dddb..6db1db54883508cd572e24f93e7bee14e286967d:/pipe.c diff --git a/pipe.c b/pipe.c index 12aa73d7..5f79edef 100644 --- a/pipe.c +++ b/pipe.c @@ -4,7 +4,7 @@ * Copyright (C) 1996-2000 Andrew Tridgell * Copyright (C) 1996 Paul Mackerras * Copyright (C) 2001, 2002 Martin Pool - * Copyright (C) 2004-2007 Wayne Davison + * Copyright (C) 2004-2008 Wayne Davison * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -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");