Made the new %M escape handle multiple spaces in the timestamp

[rsync/rsync.git] / log.c

diff --git a/log.c b/log.c
index af09712..dad939b 100644 (file)
--- a/log.c
+++ b/log.c
@@ -467,8 +467,8 @@ static void log_formatted(enum logcode code, char *format, char *op,
                case 'M':
                        n = timestring(file->modtime);
                        {
-                               char *cp = strchr(n, ' ');
-                               if (cp)
+                               char *cp;
+                               while ((cp = strchr(n, ' ')) != NULL)
                                        *cp = '-';
                        }
                        break;
@@ -733,11 +733,11 @@ void log_exit(int code, const char *file, int line)
 
                /* VANISHED is not an error, only a warning */
                if (code == RERR_VANISHED) {
-                       rprintf(FINFO, "rsync warning: %s (code %d) at %s(%d)\n", 
-                               name, code, file, line);
+                       rprintf(FINFO, "rsync warning: %s (code %d) at %s(%d) [%s]\n", 
+                               name, code, file, line, who_am_i());
                } else {
-                       rprintf(FERROR, "rsync error: %s (code %d) at %s(%d)\n",
-                               name, code, file, line);
+                       rprintf(FERROR, "rsync error: %s (code %d) at %s(%d) [%s]\n",
+                               name, code, file, line, who_am_i());
                }
        }
 }