X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/c2be690cc662aaf2782fe79cdb3872c447037fb7..b66e31bf15c83904f14f9b7b40eeecaadc2971ba:/log.c

diff --git a/log.c b/log.c
index 0b2b8e95..f2df6000 100644
--- a/log.c
+++ b/log.c
@@ -218,18 +218,21 @@ void rwrite(enum logcode code, char *buf, int len)
 	int trailing_CR_or_NL;
 	FILE *f = NULL;
 
-	if (quiet && code == FINFO)
-		return;
-
 	if (len < 0)
 		exit_cleanup(RERR_MESSAGEIO);
 
+	if (quiet && code == FINFO)
+		return;
+
 	if (am_server && msg_fd_out >= 0) {
 		/* Pass the message to our sibling. */
 		send_msg((enum msgcode)code, buf, len);
 		return;
 	}
 
+	if (code == FSOCKERR) /* This gets simplified for a non-sibling. */
+		code = FERROR;
+
 	if (code == FCLIENT)
 		code = FINFO;
 	else if (am_daemon) {
@@ -265,10 +268,11 @@ void rwrite(enum logcode code, char *buf, int len)
 	case FERROR:
 		log_got_error = 1;
 		f = stderr;
-		break;
+		goto pre_scan;
 	case FINFO:
 		f = am_server ? stderr : stdout;
-		while (len && (*buf == '\n' || *buf == '\t')) {
+	pre_scan:
+		while (len > 1 && (*buf == '\n' || *buf == '\t')) {
 			fputc(*buf, f);
 			buf++;
 			len--;
@@ -535,18 +539,17 @@ static void log_formatted(enum logcode code, char *format, char *op,
 			     : !(iflags & ITEM_TRANSFER) ? '.'
 			     : !local_server && *op == 's' ? '<' : '>';
 			n[1] = S_ISDIR(file->mode) ? 'd'
+			     : IS_SPECIAL(file->mode) ? 'S'
 			     : 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) ? '.'
-			     : !preserve_times || IS_DEVICE(file->mode)
-					       || S_ISLNK(file->mode) ? 'T' : 't';
+			     : !preserve_times || 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[8] = !(iflags & ITEM_REPORT_XATTRS) ? '.' : 'a';
-			n[9] = '\0';
+			n[8] = '\0';
 
 			if (iflags & (ITEM_IS_NEW|ITEM_MISSING_DATA)) {
 				char ch = iflags & ITEM_IS_NEW ? '+' : '?';
@@ -646,7 +649,7 @@ void maybe_log_item(struct file_struct *file, int iflags, int itemizing,
 {
 	int significant_flags = iflags & SIGNIFICANT_ITEM_FLAGS;
 	int see_item = itemizing && (significant_flags || *buf
-				  || (verbose > 1 && log_format_has_i));
+		|| log_format_has_i > 1 || (verbose > 1 && log_format_has_i));
 	int local_change = iflags & ITEM_LOCAL_CHANGE && significant_flags;
 	if (am_server) {
 		if (am_daemon && !dry_run && see_item)