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

diff --git a/log.c b/log.c
index eb54cb55..70aa96df 100644
--- a/log.c
+++ b/log.c
@@ -27,13 +27,14 @@
   */
 #include "rsync.h"
 
-extern int dry_run;
+extern int itemize_changes;
 extern int am_daemon;
 extern int am_server;
 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 char *auth_user;
 extern char *log_format;
@@ -87,7 +88,7 @@ static char const *rerr_name(int code)
 	return NULL;
 }
 
-static void log_open(void)
+void log_open(void)
 {
 	if (logfname && !logfile) {
 		extern int orig_umask;
@@ -102,6 +103,14 @@ static void log_open(void)
 	}
 }
 
+void log_close(void)
+{
+	if (logfile) {
+		fclose(logfile);
+		logfile = NULL;
+	}
+}
+
 static void logit(int priority, char *buf)
 {
 	if (logfname) {
@@ -155,14 +164,6 @@ void log_init(void)
 #endif
 }
 
-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)
@@ -343,7 +344,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 +381,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,19 +422,24 @@ 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
-			     ? '*' : *op == 's' ? '>' : '<';
-			n[1] = S_ISDIR(file->mode) ? 'd' : IS_DEVICE(file->mode) ? 'D'
+			n[0] = !(iflags & ITEM_UPDATING) ? '.'
+			     : *op == 's' ? '>' : '<';
+			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';
-			n[4] = !(iflags & ITEM_REPORT_TIME) ? '-'
+			n[2] = !(iflags & ITEM_REPORT_CHECKSUM) ? '.' : 'c';
+			n[3] = !(iflags & ITEM_REPORT_SIZE) ? '.' : 's';
+			n[4] = !(iflags & ITEM_REPORT_TIME) ? '.'
 			     : !preserve_times || IS_DEVICE(file->mode)
 					       || S_ISLNK(file->mode) ? 'T' : 't';
-			n[5] = !(iflags & ITEM_REPORT_PERMS) ? '-' : 'p';
-			n[6] = !(iflags & ITEM_REPORT_OWNER) ? '-' : 'o';
-			n[7] = !(iflags & ITEM_REPORT_GROUP) ? '-' : 'g';
+			n[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p';
+			n[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o';
+			n[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g';
 			n[8] = '\0';
 
 			if (iflags & (ITEM_IS_NEW|ITEM_MISSING_DATA)) {
@@ -436,6 +447,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;
 		}
@@ -498,6 +520,31 @@ 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);
+	enum logcode code;
+	char *fmt;
+
+	file.mode = mode;
+	file.basename = fname;
+
+	if (am_server && protocol_version >= 29 && len < MAXPATHLEN) {
+		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;
+	}
+
+	log_formatted(code, fmt, "del.", &file, &stats, ITEM_DELETED);
+}
 
 
 /*