X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/2267efeac542205a19c1fb2d45db9df460712956..8ebdc9724efd6a4f3aeaf6287f5dc7c4762969b8:/log.c

diff --git a/log.c b/log.c
index d191ea10..54c043fd 100644
--- a/log.c
+++ b/log.c
@@ -27,6 +27,7 @@
   */
 #include "rsync.h"
 
+extern int verbose;
 extern int dry_run;
 extern int am_daemon;
 extern int am_server;
@@ -34,7 +35,10 @@ extern int am_sender;
 extern int quiet;
 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;
 
@@ -87,28 +91,6 @@ static char const *rerr_name(int code)
 	return NULL;
 }
 
-void log_open(void)
-{
-	if (logfname && !logfile) {
-		extern int orig_umask;
-		int old_umask = umask(022 | orig_umask);
-		logfile = fopen(logfname, "a");
-		umask(old_umask);
-		if (!logfile) {
-			am_daemon = 0; /* avoid trying to log again */
-			rsyserr(FERROR, errno, "fopen() of log-file failed");
-			exit_cleanup(RERR_FILESELECT);
-		}
-	}
-}
-
-void log_close(void)
-{
-	if (logfile) {
-		fclose(logfile);
-		logfile = NULL;
-	}
-}
 
 static void logit(int priority, char *buf)
 {
@@ -163,6 +145,29 @@ void log_init(void)
 #endif
 }
 
+void log_open(void)
+{
+	if (logfname && !logfile) {
+		extern int orig_umask;
+		int old_umask = umask(022 | orig_umask);
+		logfile = fopen(logfname, "a");
+		umask(old_umask);
+		if (!logfile) {
+			am_daemon = 0; /* avoid trying to log again */
+			rsyserr(FERROR, errno, "fopen() of log-file failed");
+			exit_cleanup(RERR_FILESELECT);
+		}
+	}
+}
+
+void log_close(void)
+{
+	if (logfile) {
+		fclose(logfile);
+		logfile = NULL;
+	}
+}
+
 /* this is the underlying (unformatted) rsync debugging function. Call
  * it with FINFO, FERROR or FLOG */
 void rwrite(enum logcode code, char *buf, int len)
@@ -184,7 +189,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;
@@ -343,7 +350,7 @@ static void log_formatted(enum logcode code,
 			  struct stats *initial_stats, int iflags)
 {
 	char buf[MAXPATHLEN+1024];
-	char buf2[1024];
+	char buf2[MAXPATHLEN];
 	char *p, *n;
 	size_t len, total;
 	int64 b;
@@ -380,9 +387,14 @@ static void log_formatted(enum logcode code,
 			break;
 		case 'n':
 			n = (char*)safe_fname(f_name(file));
+			if (S_ISDIR(file->mode)) {
+				/* The buffer from safe_fname() has more
+				 * room than MAXPATHLEN, so this is safe. */
+				strcat(n, "/");
+			}
 			break;
 		case 'L':
-			if (S_ISLNK(file->mode)) {
+			if (S_ISLNK(file->mode) && file->u.link) {
 				snprintf(buf2, sizeof buf2, " -> %s",
 					 safe_fname(file->u.link));
 				n = buf2;
@@ -416,11 +428,15 @@ static void log_formatted(enum logcode code,
 			n = buf2;
 			break;
 		case 'i':
+			if (iflags & ITEM_DELETED) {
+				n = "deleting";
+				break;
+			}
 			n = buf2;
-			n[0] = !(iflags & ITEM_UPDATING) ? ' '
-			     : dry_run ? '*'
+			n[0] = !(iflags & ITEM_UPDATING) ? '.'
 			     : *op == 's' ? '>' : '<';
-			n[1] = S_ISDIR(file->mode) ? 'd' : IS_DEVICE(file->mode) ? 'D'
+			n[1] = S_ISDIR(file->mode) ? 'd'
+			     : IS_DEVICE(file->mode) ? 'D'
 			     : S_ISLNK(file->mode) ? 'L' : 'f';
 			n[2] = !(iflags & ITEM_REPORT_CHECKSUM) ? '.' : 'c';
 			n[3] = !(iflags & ITEM_REPORT_SIZE) ? '.' : 's';
@@ -437,6 +453,17 @@ static void log_formatted(enum logcode code,
 				int i;
 				for (i = 2; n[i]; i++)
 					n[i] = ch;
+			} else if (!(iflags & ITEM_UPDATING)) {
+				int i;
+				for (i = 2; n[i]; i++) {
+					if (n[i] != '.')
+						break;
+				}
+				if (!n[i]) {
+					for (i = 2; n[i]; i++)
+						n[i] = ' ';
+					n[0] = '=';
+				}
 			}
 			break;
 		}
@@ -499,6 +526,32 @@ void log_recv(struct file_struct *file, struct stats *initial_stats, int iflags)
 }
 
 
+void log_delete(char *fname, int mode)
+{
+	static struct file_struct file;
+	int len = strlen(fname);
+	char *fmt;
+
+	file.mode = mode;
+	file.basename = fname;
+
+	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);
+	} else {
+		fmt = log_format_has_o_or_i ? log_format : "%i %n";
+		log_formatted(FCLIENT, fmt, "del.", &file, &stats, ITEM_DELETED);
+	}
+
+	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";
+	log_formatted(FLOG, fmt, "del.", &file, &stats, ITEM_DELETED);
+}
 
 
 /*
@@ -510,7 +563,7 @@ void log_recv(struct file_struct *file, struct stats *initial_stats, int iflags)
 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);