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 d4cce69..dad939b 100644 (file)
--- 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);
@@ -218,18 +218,21 @@ void rwrite(enum logcode code, char *buf, int len)
        int trailing_CR_or_NL;
        FILE *f = NULL;
 
-       if (quiet && code == FINFO)
-               return;
-
        if (len < 0)
                exit_cleanup(RERR_MESSAGEIO);
 
+       if (quiet && code == FINFO)
+               return;
+
        if (am_server && msg_fd_out >= 0) {
                /* Pass the message to our sibling. */
                send_msg((enum msgcode)code, buf, len);
                return;
        }
 
+       if (code == FSOCKERR) /* This gets simplified for a non-sibling. */
+               code = FERROR;
+
        if (code == FCLIENT)
                code = FINFO;
        else if (am_daemon) {
@@ -269,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--;
@@ -443,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;
+                               while ((cp = strchr(n, ' ')) != NULL)
+                                       *cp = '-';
+                       }
+                       break;
+               case 'B':
+                       n = buf2 + MAXPATHLEN - PERMSTRING_SIZE;
+                       permstring(n - 1, file->mode); /* skip the type char */
+                       break;
                case 'o':
                        n = op;
                        break;
@@ -536,6 +563,7 @@ static void log_formatted(enum logcode code, char *format, char *op,
                             : !(iflags & ITEM_TRANSFER) ? '.'
                             : !local_server && *op == 's' ? '<' : '>';
                        n[1] = S_ISDIR(file->mode) ? 'd'
+                            : IS_SPECIAL(file->mode) ? 'S'
                             : IS_DEVICE(file->mode) ? 'D'
                             : S_ISLNK(file->mode) ? 'L' : 'f';
                        n[2] = !(iflags & ITEM_REPORT_CHECKSUM) ? '.' : 'c';
@@ -705,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());
                }
        }
 }