X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/ddd74b67be3f28bee4bb2042983e004486609bab..dcbae65444a82532d9a0e5caf5b3861ed1e6f95f:/log.c

diff --git a/log.c b/log.c
index b3a0dad4..c6d2fc81 100644
--- a/log.c
+++ b/log.c
@@ -367,7 +367,9 @@ static void log_formatted(enum logcode code, char *format, char *op,
 	for (p = buf; (p = strchr(p, '%')) != NULL && p[1]; ) {
 		s = p++;
 		n = fmt + 1;
-		while (isdigit(*(uchar*)p) && n - fmt < 16)
+		if (*p == '-')
+			*n++ = *p++;
+		while (isdigit(*(uchar*)p) && n - fmt < (int)(sizeof fmt) - 8)
 			*n++ = *p++;
 		*n = '\0';
 		n = NULL;
@@ -389,15 +391,23 @@ static void log_formatted(enum logcode code, char *format, char *op,
 			break;
 		case 'o': n = op; break;
 		case 'f':
-			pathjoin(buf2, sizeof buf2,
-			    am_sender && file->dir.root ? file->dir.root : "",
-			    safe_fname(f_name(file)));
-			clean_fname(buf2, 0);
-			n = buf2;
-			if (*n == '/') n++;
+			n = safe_fname(f_name(file));
+			if (am_sender && file->dir.root) {
+				pathjoin(buf2, sizeof buf2,
+					 file->dir.root, n);
+				/* The buffer from safe_fname() has more
+				 * room than MAXPATHLEN, so this is safe. */
+				if (fmt[1])
+					strcpy(n, buf2);
+				else
+					n = buf2;
+			}
+			clean_fname(n, 0);
+			if (*n == '/')
+				n++;
 			break;
 		case 'n':
-			n = (char*)safe_fname(f_name(file));
+			n = safe_fname(f_name(file));
 			if (S_ISDIR(file->mode)) {
 				/* The buffer from safe_fname() has more
 				 * room than MAXPATHLEN, so this is safe. */
@@ -449,7 +459,7 @@ static void log_formatted(enum logcode code, char *format, char *op,
 				n = "*deleting";
 				break;
 			}
-			n = buf2;
+			n = buf2 + MAXPATHLEN - 32;
 			n[0] = iflags & ITEM_LOCAL_CHANGE
 			      ? iflags & ITEM_XNAME_FOLLOWS ? 'h' : 'c'
 			     : !(iflags & ITEM_TRANSFER) ? '.'
@@ -493,6 +503,11 @@ static void log_formatted(enum logcode code, char *format, char *op,
 		/* "n" is the string to be inserted in place of this % code. */
 		if (!n)
 			continue;
+		if (n != buf2 && fmt[1]) {
+			strlcat(fmt, "s", sizeof fmt);
+			snprintf(buf2, sizeof buf2, fmt, n);
+			n = buf2;
+		}
 		len = strlen(n);
 
 		if (len + total >= sizeof buf) {