X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/4a50a2176e6dc4dad75c8943669d6075f4e86209..be0602ec3c833735d3d2fd7e8cd1319a7695187b:/log.c diff --git a/log.c b/log.c index c93989b7..52e3dacd 100644 --- a/log.c +++ b/log.c @@ -191,12 +191,34 @@ void logfile_reopen(void) } } +static void filtered_fwrite(const char *buf, int len, FILE *f) +{ + const char *s, *end = buf + len; + for (s = buf; s < end; s++) { + if ((s < end - 4 + && *s == '\\' && s[1] == '0' + && isdigit(*(uchar*)(s+2)) + && isdigit(*(uchar*)(s+3)) + && isdigit(*(uchar*)(s+4))) + || !isprint(*(uchar*)s) + || *(uchar*)s < ' ') { + if (s != buf && fwrite(buf, s - buf, 1, f) != 1) + exit_cleanup(RERR_MESSAGEIO); + fprintf(f, "\\%04o", *(uchar*)s); + buf = s + 1; + } + } + if (buf != end && fwrite(buf, end - buf, 1, f) != 1) + exit_cleanup(RERR_MESSAGEIO); +} + /* this is the underlying (unformatted) rsync debugging function. Call - * it with FINFO, FERROR or FLOG */ + * it with FINFO, FERROR or FLOG. Note: recursion can happen with + * certain fatal conditions. */ void rwrite(enum logcode code, char *buf, int len) { + int trailing_CR_or_NL; FILE *f = NULL; - /* recursion can happen with certain fatal conditions */ if (quiet && code == FINFO) return; @@ -204,8 +226,6 @@ void rwrite(enum logcode code, char *buf, int len) if (len < 0) exit_cleanup(RERR_MESSAGEIO); - buf[len] = 0; - if (am_server && msg_fd_out >= 0) { /* Pass the message to our sibling. */ send_msg((enum msgcode)code, buf, len); @@ -243,22 +263,35 @@ void rwrite(enum logcode code, char *buf, int len) } } - if (code == FERROR) { + switch (code) { + case FERROR: log_got_error = 1; f = stderr; - } - - if (code == FINFO) + break; + case FINFO: f = am_server ? stderr : stdout; - - if (!f) + while (len && (*buf == '\n' || *buf == '\t')) { + fputc(*buf, f); + buf++; + len--; + } + break; + case FNAME: + f = am_server ? stderr : stdout; + break; + default: exit_cleanup(RERR_MESSAGEIO); + } - if (fwrite(buf, len, 1, f) != 1) - exit_cleanup(RERR_MESSAGEIO); + trailing_CR_or_NL = len && (buf[len-1] == '\n' || buf[len-1] == '\r') + ? buf[--len] : 0; - if (buf[len-1] == '\r' || buf[len-1] == '\n') + filtered_fwrite(buf, len, f); + + if (trailing_CR_or_NL) { + fputc(trailing_CR_or_NL, f); fflush(f); + } } @@ -267,7 +300,7 @@ void rwrite(enum logcode code, char *buf, int len) void rprintf(enum logcode code, const char *format, ...) { va_list ap; - char buf[MAXPATHLEN+512]; + char buf[BIGPATHBUFLEN]; size_t len; va_start(ap, format); @@ -278,7 +311,7 @@ void rprintf(enum logcode code, const char *format, ...) * truncate the resulting string. (Note that configure ensures * that we have a vsnprintf() that doesn't ever return -1.) */ if (len > sizeof buf - 1) { - const char ellipsis[] = "[...]"; + static const char ellipsis[] = "[...]"; /* Reset length, and zero-terminate the end of our buffer */ len = sizeof buf - 1; @@ -294,7 +327,7 @@ void rprintf(enum logcode code, const char *format, ...) * If the input format string has a trailing newline, * we copy it into that extra null; if it doesn't, well, * all we lose is one byte. */ - strncpy(buf+len-sizeof ellipsis, ellipsis, sizeof ellipsis); + memcpy(buf+len-sizeof ellipsis, ellipsis, sizeof ellipsis); if (format[strlen(format)-1] == '\n') { buf[len-1] = '\n'; } @@ -315,7 +348,7 @@ void rprintf(enum logcode code, const char *format, ...) void rsyserr(enum logcode code, int errcode, const char *format, ...) { va_list ap; - char buf[MAXPATHLEN+512]; + char buf[BIGPATHBUFLEN]; size_t len; strcpy(buf, RSYNC_NAME ": "); @@ -403,8 +436,14 @@ static void log_formatted(enum logcode code, char *format, char *op, n = NULL; switch (*p) { - case 'h': if (am_daemon) n = client_name(0); break; - case 'a': if (am_daemon) n = client_addr(0); break; + case 'h': + if (am_daemon) + n = client_name(0); + break; + case 'a': + if (am_daemon) + n = client_addr(0); + break; case 'l': strlcat(fmt, ".0f", sizeof fmt); snprintf(buf2, sizeof buf2, fmt, @@ -417,37 +456,35 @@ static void log_formatted(enum logcode code, char *format, char *op, (long)getpid()); n = buf2; break; - case 'o': n = op; break; + case 'o': + n = op; + break; case 'f': - n = safe_fname(f_name(file)); + n = f_name(file, NULL); 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. */ + clean_fname(buf2, 0); if (fmt[1]) - strcpy(n, buf2); + strlcpy(n, buf2, MAXPATHLEN); else n = buf2; - } - clean_fname(n, 0); + } else + clean_fname(n, 0); if (*n == '/') n++; break; case 'n': - 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. */ - strcat(n, "/"); - } + n = f_name(file, NULL); + if (S_ISDIR(file->mode)) + strlcat(n, "/", MAXPATHLEN); break; case 'L': if (hlink && *hlink) { - n = safe_fname(hlink); + n = hlink; strcpy(buf2, " => "); } else if (S_ISLNK(file->mode) && file->u.link) { - n = safe_fname(file->u.link); + n = file->u.link; strcpy(buf2, " -> "); } else { n = ""; @@ -459,10 +496,18 @@ static void log_formatted(enum logcode code, char *format, char *op, snprintf(buf2 + 4, sizeof buf2 - 4, fmt, n); n = buf2; break; - case 'm': n = lp_name(module_id); break; - case 't': n = timestring(time(NULL)); break; - case 'P': n = lp_path(module_id); break; - case 'u': n = auth_user; break; + case 'm': + n = lp_name(module_id); + break; + case 't': + n = timestring(time(NULL)); + break; + case 'P': + n = lp_path(module_id); + break; + case 'u': + n = auth_user; + break; case 'b': if (am_sender) { b = stats.total_written - @@ -599,7 +644,7 @@ void log_item(struct file_struct *file, struct stats *initial_stats, log_formatted(FLOG, lp_log_format(module_id), s_or_r, file, initial_stats, iflags, hlink); } else if (log_format && !am_server) { - log_formatted(FINFO, log_format, s_or_r, + log_formatted(FNAME, log_format, s_or_r, file, initial_stats, iflags, hlink); } }