From: Wayne Davison <wayned@samba.org>
Date: Fri, 21 Apr 2006 02:56:35 +0000 (+0000)
Subject: Fixed a build problem with the last change.
X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/commitdiff_plain/21c15524c9b55c7830ba6a2e8c20d93d73d0f297

Fixed a build problem with the last change.
---

diff --git a/log-file.diff b/log-file.diff
index 7bfc8bc..f86ec96 100644
--- a/log-file.diff
+++ b/log-file.diff
@@ -3,11 +3,12 @@ are doing, similar to how a daemon logs its actions.
 
 --- old/cleanup.c
 +++ new/cleanup.c
-@@ -21,10 +21,12 @@
+@@ -21,10 +21,13 @@
  
  #include "rsync.h"
  
 +extern int am_server;
++extern int am_daemon;
  extern int io_error;
  extern int keep_partial;
  extern int log_got_error;
@@ -16,7 +17,7 @@ are doing, similar to how a daemon logs its actions.
  
  #ifdef HAVE_SIGACTION
  static struct sigaction sigact;
-@@ -149,7 +151,7 @@ void _exit_cleanup(int code, const char 
+@@ -149,7 +152,7 @@ void _exit_cleanup(int code, const char 
  			code = RERR_PARTIAL;
  	}
  
@@ -144,7 +145,7 @@ are doing, similar to how a daemon logs its actions.
  			     ? FCLIENT : FINFO;
  			rprintf(code, "%s%s\n", fname,
  				match_level == 3 ? " is uptodate" : "");
-@@ -746,7 +746,7 @@ static int try_dests_non(struct file_str
+@@ -758,7 +758,7 @@ static int try_dests_non(struct file_str
  			itemize(file, ndx, 0, &st, changes, 0, lp);
  		}
  		if (verbose > 1 && maybe_ATTRS_REPORT) {
@@ -153,7 +154,7 @@ are doing, similar to how a daemon logs its actions.
  			     ? FCLIENT : FINFO;
  			rprintf(code, "%s is uptodate\n", fname);
  		}
-@@ -1309,9 +1309,9 @@ void generate_files(int f_out, struct fi
+@@ -1327,9 +1327,9 @@ void generate_files(int f_out, struct fi
  	if (protocol_version >= 29) {
  		itemizing = 1;
  		maybe_ATTRS_REPORT = log_format_has_i ? 0 : ATTRS_REPORT;
@@ -491,7 +492,7 @@ are doing, similar to how a daemon logs its actions.
       --log-format=FORMAT     output filenames using the specified format
       --password-file=FILE    read password from FILE
       --list-only             list the files instead of copying them
-@@ -1423,6 +1424,23 @@ the string "*deleting" for each item tha
+@@ -1430,6 +1431,23 @@ the string "*deleting" for each item tha
  you are talking to a recent enough rsync that it logs deletions instead of
  outputting them as a verbose message).