X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/be0602ec3c833735d3d2fd7e8cd1319a7695187b..4e7d07c8d4c75f0fc4207f0d6058db99b61c2f17:/log.c

diff --git a/log.c b/log.c
index 52e3dacd..d4cce69f 100644
--- a/log.c
+++ b/log.c
@@ -84,7 +84,6 @@ struct {
 };
 
 
-
 /*
  * Map from rsync error code to name, or return NULL.
  */
@@ -98,7 +97,6 @@ static char const *rerr_name(int code)
 	return NULL;
 }
 
-
 static void logit(int priority, char *buf)
 {
 	if (logfile_was_closed)
@@ -267,10 +265,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--;
@@ -294,7 +293,6 @@ void rwrite(enum logcode code, char *buf, int len)
 	}
 }
 
-
 /* This is the rsync debugging function. Call it with FINFO, FERROR or
  * FLOG. */
 void rprintf(enum logcode code, const char *format, ...)
@@ -336,7 +334,6 @@ void rprintf(enum logcode code, const char *format, ...)
 	rwrite(code, buf, len);
 }
 
-
 /* This is like rprintf, but it also tries to print some
  * representation of the error code.  Normally errcode = errno.
  *
@@ -368,8 +365,6 @@ void rsyserr(enum logcode code, int errcode, const char *format, ...)
 	rwrite(code, buf, len);
 }
 
-
-
 void rflush(enum logcode code)
 {
 	FILE *f = NULL;
@@ -397,8 +392,6 @@ void rflush(enum logcode code)
 	fflush(f);
 }
 
-
-
 /* a generic logging routine for send/recv, with parameter
  * substitiution */
 static void log_formatted(enum logcode code, char *format, char *op,
@@ -548,13 +541,11 @@ static void log_formatted(enum logcode code, char *format, char *op,
 			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 ? '+' : '?';
@@ -654,7 +645,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)
@@ -692,7 +683,6 @@ void log_delete(char *fname, int mode)
 	log_formatted(FLOG, fmt, "del.", &file, &stats, ITEM_DELETED, NULL);
 }
 
-
 /*
  * Called when the transfer is interrupted for some reason.
  *