From 427b6179b9c90e5aed4435f8405f4718ff32f90c Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Fri, 3 Feb 2006 19:59:25 +0000
Subject: [PATCH] - Allow tab characters to appear in rwrite() messages. -
 Added %M (modtime), %U (uid), %G (gid), and %B (perm bits) to  
 log_formatted().

---
 log.c | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/log.c b/log.c
index f2df6000..af097122 100644
--- a/log.c
+++ b/log.c
@@ -198,8 +198,8 @@ static void filtered_fwrite(const char *buf, int len, FILE *f)
 		  && isdigit(*(uchar*)(s+2))
 		  && isdigit(*(uchar*)(s+3))
 		  && isdigit(*(uchar*)(s+4)))
-		 || !isprint(*(uchar*)s)
-		 || *(uchar*)s < ' ') {
+		 || ((!isprint(*(uchar*)s) || *(uchar*)s < ' ')
+		  && *s != '\t')) {
 			if (s != buf && fwrite(buf, s - buf, 1, f) != 1)
 				exit_cleanup(RERR_MESSAGEIO);
 			fprintf(f, "\\%04o", *(uchar*)s);
@@ -272,7 +272,7 @@ void rwrite(enum logcode code, char *buf, int len)
 	case FINFO:
 		f = am_server ? stderr : stdout;
 	pre_scan:
-		while (len > 1 && (*buf == '\n' || *buf == '\t')) {
+		while (len > 1 && *buf == '\n') {
 			fputc(*buf, f);
 			buf++;
 			len--;
@@ -446,12 +446,36 @@ static void log_formatted(enum logcode code, char *format, char *op,
 				 (double)file->length);
 			n = buf2;
 			break;
+		case 'U':
+			strlcat(fmt, "ld", sizeof fmt);
+			snprintf(buf2, sizeof buf2, fmt,
+				 (long)file->uid);
+			n = buf2;
+			break;
+		case 'G':
+			strlcat(fmt, "d", sizeof fmt);
+			snprintf(buf2, sizeof buf2, fmt,
+				 (long)file->gid);
+			n = buf2;
+			break;
 		case 'p':
 			strlcat(fmt, "ld", sizeof fmt);
 			snprintf(buf2, sizeof buf2, fmt,
 				 (long)getpid());
 			n = buf2;
 			break;
+		case 'M':
+			n = timestring(file->modtime);
+			{
+				char *cp = strchr(n, ' ');
+				if (cp)
+					*cp = '-';
+			}
+			break;
+		case 'B':
+			n = buf2 + MAXPATHLEN - PERMSTRING_SIZE;
+			permstring(n - 1, file->mode); /* skip the type char */
+			break;
 		case 'o':
 			n = op;
 			break;
-- 
2.34.1