Some demon_log_* variables changed into logfile_* variables that are

[rsync/rsync.git] / cleanup.c

diff --git a/cleanup.c b/cleanup.c
index 1acc348..d638868 100644 (file)
--- a/cleanup.c
+++ b/cleanup.c
@@ -16,17 +16,20 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include "rsync.h"
 
+extern int am_server;
+extern int am_daemon;
 extern int io_error;
 extern int keep_partial;
 extern int log_got_error;
 extern char *partial_dir;
+extern char *logfile_name;
 
 #ifdef HAVE_SIGACTION
 static struct sigaction sigact;
@@ -151,7 +154,7 @@ void _exit_cleanup(int code, const char *file, int line)
                        code = RERR_PARTIAL;
        }
 
-       if (code)
+       if (code || am_daemon || (logfile_name && (am_server || !verbose)))
                log_exit(code, file, line);
 
        if (verbose > 2) {