X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/19bc826d8b16a750d5826998d739692928a45103..9118a09c770b6ae6f136395c087e76e3768167a8:/log.c

diff --git a/log.c b/log.c
index 70aa96df..aa1784af 100644
--- a/log.c
+++ b/log.c
@@ -27,7 +27,7 @@
   */
 #include "rsync.h"
 
-extern int itemize_changes;
+extern int dry_run;
 extern int am_daemon;
 extern int am_server;
 extern int am_sender;
@@ -36,6 +36,8 @@ extern int module_id;
 extern int msg_fd_out;
 extern int protocol_version;
 extern int preserve_times;
+extern int log_format_has_o_or_i;
+extern int daemon_log_format_has_o_or_i;
 extern char *auth_user;
 extern char *log_format;
 
@@ -185,7 +187,9 @@ void rwrite(enum logcode code, char *buf, int len)
 		return;
 	}
 
-	if (am_daemon) {
+	if (code == FCLIENT)
+		code = FINFO;
+	else if (am_daemon) {
 		static int in_block;
 		char msg[2048];
 		int priority = code == FERROR ? LOG_WARNING : LOG_INFO;
@@ -524,7 +528,6 @@ void log_delete(char *fname, int mode)
 {
 	static struct file_struct file;
 	int len = strlen(fname);
-	enum logcode code;
 	char *fmt;
 
 	file.mode = mode;
@@ -534,16 +537,16 @@ void log_delete(char *fname, int mode)
 		if (S_ISDIR(mode))
 			len++; /* directories include trailing null */
 		send_msg(MSG_DELETED, fname, len);
-		if (!am_daemon)
-			return;
-		fmt = lp_log_format(module_id);
-		code = FLOG;
 	} else {
-		fmt = log_format && itemize_changes ? log_format : "%i %n";
-		code = FINFO;
+		fmt = log_format_has_o_or_i ? log_format : "%i %n";
+		log_formatted(FCLIENT, fmt, "del.", &file, &stats, ITEM_DELETED);
 	}
 
-	log_formatted(code, fmt, "del.", &file, &stats, ITEM_DELETED);
+	if (!am_daemon || dry_run)
+		return;
+
+	fmt = daemon_log_format_has_o_or_i ? lp_log_format(module_id) : "%i %n";
+	log_formatted(FLOG, fmt, "del.", &file, &stats, ITEM_DELETED);
 }
 
 
@@ -556,7 +559,7 @@ void log_delete(char *fname, int mode)
 void log_exit(int code, const char *file, int line)
 {
 	if (code == 0) {
-		rprintf(FLOG,"wrote %.0f bytes  read %.0f bytes  total size %.0f\n",
+		rprintf(FLOG,"sent %.0f bytes  received %.0f bytes  total size %.0f\n",
 			(double)stats.total_written,
 			(double)stats.total_read,
 			(double)stats.total_size);