mirror/rsync
1
0
Fork 0
mirror of https://github.com/RsyncProject/rsync.git synced 2026-03-02 05:18:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

The log_delete() function may now be called even when the client is

Browse Source 
not getting delete messages, which ensures that the daemon's log-
file output includes all deletions when per-file logging is enabled.
This commit is contained in:
Wayne Davison
2005-02-26 04:49:30 +00:00
parent a3e1363aaa
commit 41b5b5e756
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
log.c
View File

@@ -27,6 +27,7 @@
*/
#include "rsync.h"
extern int verbose;
extern int dry_run;
extern int am_daemon;
extern int am_server;
@@ -534,7 +535,9 @@ void log_delete(char *fname, int mode)
file.mode = mode;
file.basename = fname;
if (am_server && protocol_version >= 29 && len < MAXPATHLEN) {
if (!verbose && !log_format)
;
else if (am_server && protocol_version >= 29 && len < MAXPATHLEN) {
if (S_ISDIR(mode))
len++; /* directories include trailing null */
send_msg(MSG_DELETED, fname, len);
@@ -543,7 +546,7 @@ void log_delete(char *fname, int mode)
log_formatted(FCLIENT, fmt, "del.", &file, &stats, ITEM_DELETED);
}
if (!am_daemon || dry_run)
if (!am_daemon || dry_run || !lp_transfer_logging(module_id))
return;
fmt = daemon_log_format_has_o_or_i ? lp_log_format(module_id) : "%i %n";