Needed to make %G output "DEFAULT" when gid == GID_NONE.

1 files changed, 10 insertions, 6 deletions

diff --git a/log.c b/log.c
index dad939b1..bc8c747a 100644
--- a/log.c
+++ b/log.c
@@ -453,10 +453,14 @@ static void log_formatted(enum logcode code, char *format, char *op,
 			n = buf2;
 			break;
 		case 'G':
-			strlcat(fmt, "d", sizeof fmt);
-			snprintf(buf2, sizeof buf2, fmt,
-				 (long)file->gid);
-			n = buf2;
+			if (file->gid == GID_NONE)
+				n = "DEFAULT";
+			else {
+				strlcat(fmt, "ld", sizeof fmt);
+				snprintf(buf2, sizeof buf2, fmt,
+					 (long)file->gid);
+				n = buf2;
+			}
 			break;
 		case 'p':
 			strlcat(fmt, "ld", sizeof fmt);
@@ -467,8 +471,8 @@ static void log_formatted(enum logcode code, char *format, char *op,
 		case 'M':
 			n = timestring(file->modtime);
 			{
-				char *cp;
-				while ((cp = strchr(n, ' ')) != NULL)
+				char *cp = n;
+				while ((cp = strchr(cp, ' ')) != NULL)
 					*cp = '-';
 			}
 			break;