X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/16f960feb501d9c2444c1b5d8ad5ba81e932b975..3f0211b63a6cdc4a2cecfd2a0dffeba172c86a47:/log.c diff --git a/log.c b/log.c index c8a433db..fc4b5833 100644 --- a/log.c +++ b/log.c @@ -1,54 +1,67 @@ -/* -*- c-file-style: "linux"; -*- - - Copyright (C) 1998-2001 by Andrew Tridgell - Copyright (C) 2000-2001 by Martin Pool - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ - /* - Logging and utility functions. - tridge, May 1998 + * Logging and utility functions. + * + * Copyright (C) 1998-2001 Andrew Tridgell + * Copyright (C) 2000-2001 Martin Pool + * Copyright (C) 2003-2007 Wayne Davison + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, visit the http://fsf.org website. + */ - Mapping to human-readable messages added by Martin Pool - , Oct 2000. - */ #include "rsync.h" +#include "ifuncs.h" extern int verbose; extern int dry_run; extern int am_daemon; extern int am_server; extern int am_sender; +extern int am_generator; extern int local_server; extern int quiet; extern int module_id; extern int msg_fd_out; +extern int allow_8bit_chars; extern int protocol_version; extern int preserve_times; -extern int log_format_has_o_or_i; -extern int daemon_log_format_has_o_or_i; +extern int uid_ndx; +extern int gid_ndx; +extern int stdout_format_has_i; +extern int stdout_format_has_o_or_i; +extern int logfile_format_has_i; +extern int logfile_format_has_o_or_i; +extern mode_t orig_umask; extern char *auth_user; -extern char *log_format; +extern char *stdout_format; +extern char *logfile_format; +extern char *logfile_name; +#ifdef ICONV_CONST +extern iconv_t ic_chck; +#endif +#ifdef ICONV_OPTION +extern iconv_t ic_send, ic_recv; +#endif +extern char curr_dir[]; +extern char *module_dir; +extern unsigned int module_dirlen; static int log_initialised; -static char *logfname; -static FILE *logfile; +static int logfile_was_closed; +static FILE *logfile_fp; struct stats stats; -int log_got_error = 0; +int got_xfer_error = 0; struct { int code; @@ -59,14 +72,16 @@ struct { { RERR_FILESELECT , "errors selecting input/output files, dirs" }, { RERR_UNSUPPORTED, "requested action not supported" }, { RERR_STARTCLIENT, "error starting client-server protocol" }, - { RERR_LOG_FAILURE, "daemon unable to append to log-file" }, { RERR_SOCKETIO , "error in socket IO" }, { RERR_FILEIO , "error in file IO" }, { RERR_STREAMIO , "error in rsync protocol data stream" }, { RERR_MESSAGEIO , "errors with program diagnostics" }, { RERR_IPC , "error in IPC code" }, - { RERR_SIGNAL , "received SIGUSR1 or SIGINT" }, - { RERR_WAITCHILD , "some error returned by waitpid()" }, + { RERR_CRASHED , "sibling process crashed" }, + { RERR_TERMINATED , "sibling process terminated abnormally" }, + { RERR_SIGNAL1 , "received SIGUSR1" }, + { RERR_SIGNAL , "received SIGINT, SIGTERM, or SIGHUP" }, + { RERR_WAITCHILD , "waitpid() failed" }, { RERR_MALLOC , "error allocating core memory buffers" }, { RERR_PARTIAL , "some files could not be transferred" }, { RERR_VANISHED , "some files vanished before they could be transferred" }, @@ -79,8 +94,6 @@ struct { { 0, NULL } }; - - /* * Map from rsync error code to name, or return NULL. */ @@ -94,128 +107,195 @@ static char const *rerr_name(int code) return NULL; } - -static void logit(int priority, char *buf) +static void logit(int priority, const char *buf) { - if (logfname) { - if (!logfile) - log_open(); - fprintf(logfile,"%s [%d] %s", + if (logfile_was_closed) + logfile_reopen(); + if (logfile_fp) { + fprintf(logfile_fp, "%s [%d] %s", timestring(time(NULL)), (int)getpid(), buf); - fflush(logfile); + fflush(logfile_fp); } else { syslog(priority, "%s", buf); } } -void log_init(void) +static void syslog_init() { + static int been_here = 0; int options = LOG_PID; - time_t t; - if (log_initialised) + if (been_here) return; - log_initialised = 1; - - /* this looks pointless, but it is needed in order for the - * C library on some systems to fetch the timezone info - * before the chroot */ - t = time(NULL); - localtime(&t); - - /* optionally use a log file instead of syslog */ - logfname = lp_log_file(); - if (logfname) { - if (*logfname) { - log_open(); - return; - } - logfname = NULL; - } + been_here = 1; #ifdef LOG_NDELAY options |= LOG_NDELAY; #endif #ifdef LOG_DAEMON - openlog("rsyncd", options, lp_syslog_facility()); + openlog("rsyncd", options, lp_syslog_facility(module_id)); #else openlog("rsyncd", options); #endif #ifndef LOG_NDELAY - logit(LOG_INFO,"rsyncd started\n"); + logit(LOG_INFO, "rsyncd started\n"); #endif } -void log_open(void) +static void logfile_open(void) { - if (logfname && !logfile) { - extern int orig_umask; - int old_umask = umask(022 | orig_umask); - logfile = fopen(logfname, "a"); - umask(old_umask); - if (!logfile) { - am_daemon = 0; /* avoid trying to log again */ - rsyserr(FERROR, errno, "fopen() of log-file failed"); - exit_cleanup(RERR_LOG_FAILURE); - } + mode_t old_umask = umask(022 | orig_umask); + logfile_fp = fopen(logfile_name, "a"); + umask(old_umask); + if (!logfile_fp) { + int fopen_errno = errno; + /* Rsync falls back to using syslog on failure. */ + syslog_init(); + rsyserr(FERROR, fopen_errno, + "failed to open log-file %s", logfile_name); + rprintf(FINFO, "Ignoring \"log file\" setting.\n"); } } -void log_close(void) +void log_init(int restart) +{ + if (log_initialised) { + if (!restart) + return; + if (strcmp(logfile_name, lp_log_file(module_id)) != 0) { + if (logfile_fp) { + fclose(logfile_fp); + logfile_fp = NULL; + } else + closelog(); + logfile_name = NULL; + } else if (*logfile_name) + return; /* unchanged, non-empty "log file" names */ + else if (lp_syslog_facility(-1) != lp_syslog_facility(module_id)) + closelog(); + else + return; /* unchanged syslog settings */ + } else + log_initialised = 1; + + /* This looks pointless, but it is needed in order for the + * C library on some systems to fetch the timezone info + * before the chroot. */ + timestring(time(NULL)); + + /* Optionally use a log file instead of syslog. (Non-daemon + * rsyncs will have already set logfile_name, as needed.) */ + if (am_daemon && !logfile_name) + logfile_name = lp_log_file(module_id); + if (logfile_name && *logfile_name) + logfile_open(); + else + syslog_init(); +} + +void logfile_close(void) { - if (logfile) { - fclose(logfile); - logfile = NULL; + if (logfile_fp) { + logfile_was_closed = 1; + fclose(logfile_fp); + logfile_fp = NULL; } } +void logfile_reopen(void) +{ + if (logfile_was_closed) { + logfile_was_closed = 0; + logfile_open(); + } +} + +static void filtered_fwrite(FILE *f, const char *buf, int len, int use_isprint) +{ + const char *s, *end = buf + len; + for (s = buf; s < end; s++) { + if ((s < end - 4 + && *s == '\\' && s[1] == '#' + && isDigit(s + 2) + && isDigit(s + 3) + && isDigit(s + 4)) + || (*s != '\t' + && ((use_isprint && !isPrint(s)) + || *(uchar*)s < ' '))) { + if (s != buf && fwrite(buf, s - buf, 1, f) != 1) + exit_cleanup(RERR_MESSAGEIO); + fprintf(f, "\\#%03o", *(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 */ -void rwrite(enum logcode code, char *buf, int len) + * it with FINFO, FERROR_*, FWARNING, FLOG, or FCLIENT. Note: recursion + * can happen with certain fatal conditions. */ +void rwrite(enum logcode code, const char *buf, int len, int is_utf8) { + int trailing_CR_or_NL; FILE *f = NULL; - /* recursion can happen with certain fatal conditions */ - - if (quiet && code == FINFO) - return; +#ifdef ICONV_OPTION + iconv_t ic = is_utf8 && ic_recv != (iconv_t)-1 ? ic_recv : ic_chck; +#else +#ifdef ICONV_CONST + iconv_t ic = ic_chck; +#endif +#endif if (len < 0) exit_cleanup(RERR_MESSAGEIO); - buf[len] = 0; - if (am_server && msg_fd_out >= 0) { + assert(!is_utf8); /* Pass the message to our sibling. */ - send_msg((enum msgcode)code, buf, len); + send_msg((enum msgcode)code, buf, len, 0); return; } + if (code == FERROR_SOCKET) /* This gets simplified for a non-sibling. */ + code = FERROR; + if (code == FCLIENT) code = FINFO; - else if (am_daemon) { + else if (am_daemon || logfile_name) { static int in_block; char msg[2048]; - int priority = code == FERROR ? LOG_WARNING : LOG_INFO; + int priority = code == FINFO || code == FLOG ? LOG_INFO : LOG_WARNING; if (in_block) return; in_block = 1; if (!log_initialised) - log_init(); + log_init(0); strlcpy(msg, buf, MIN((int)sizeof msg, len + 1)); logit(priority, msg); in_block = 0; - if (code == FLOG || !am_server) + if (code == FLOG || (am_daemon && !am_server)) return; } else if (code == FLOG) return; + if (quiet && code == FINFO) + return; + if (am_server) { + enum msgcode msg = (enum msgcode)code; + if (protocol_version < 30) { + if (msg == MSG_ERROR) + msg = MSG_ERROR_XFER; + else if (msg == MSG_WARNING) + msg = MSG_INFO; + } /* Pass the message to the non-server side. */ - if (io_multiplex_write((enum msgcode)code, buf, len)) + if (send_msg(msg, buf, len, !is_utf8)) return; if (am_daemon) { /* TODO: can we send the error to the user somehow? */ @@ -223,31 +303,61 @@ void rwrite(enum logcode code, char *buf, int len) } } - if (code == FERROR) { - log_got_error = 1; + switch (code) { + case FERROR_XFER: + got_xfer_error = 1; + /* CONTINUE */ + case FERROR: + case FWARNING: f = stderr; + break; + case FINFO: + f = am_server ? stderr : stdout; + break; + default: + exit_cleanup(RERR_MESSAGEIO); } - if (code == FINFO) - f = am_server ? stderr : stdout; + trailing_CR_or_NL = len && (buf[len-1] == '\n' || buf[len-1] == '\r') + ? buf[--len] : 0; - if (!f) - exit_cleanup(RERR_MESSAGEIO); +#ifdef ICONV_CONST + if (ic != (iconv_t)-1) { + xbuf outbuf, inbuf; + char convbuf[1024]; + int ierrno; - if (fwrite(buf, len, 1, f) != 1) - exit_cleanup(RERR_MESSAGEIO); + INIT_CONST_XBUF(outbuf, convbuf); + INIT_XBUF(inbuf, (char*)buf, len, -1); - if (buf[len-1] == '\r' || buf[len-1] == '\n') + while (inbuf.len) { + iconvbufs(ic, &inbuf, &outbuf, 0); + ierrno = errno; + if (outbuf.len) { + filtered_fwrite(f, convbuf, outbuf.len, 0); + outbuf.len = 0; + } + if (!ierrno || ierrno == E2BIG) + continue; + fprintf(f, "\\#%03o", CVAL(inbuf.buf, inbuf.pos++)); + inbuf.len--; + } + } else +#endif + filtered_fwrite(f, buf, len, !allow_8bit_chars); + + if (trailing_CR_or_NL) { + fputc(trailing_CR_or_NL, f); fflush(f); + } } - -/* This is the rsync debugging function. Call it with FINFO, FERROR or - * FLOG. */ +/* This is the rsync debugging function. Call it with FINFO, FERROR_*, + * FWARNING, FLOG, or FCLIENT. */ 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); @@ -258,7 +368,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; @@ -274,16 +384,15 @@ 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'; } } - rwrite(code, buf, len); + rwrite(code, buf, len, 0); } - /* This is like rprintf, but it also tries to print some * representation of the error code. Normally errcode = errno. * @@ -295,10 +404,10 @@ 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 ": "); + strlcpy(buf, RSYNC_NAME ": ", sizeof buf); len = (sizeof RSYNC_NAME ": ") - 1; va_start(ap, format); @@ -312,128 +421,182 @@ void rsyserr(enum logcode code, int errcode, const char *format, ...) if (len >= sizeof buf) exit_cleanup(RERR_MESSAGEIO); - rwrite(code, buf, len); + rwrite(code, buf, len, 0); } - - void rflush(enum logcode code) { FILE *f = NULL; - - if (am_daemon) { - return; - } - if (code == FLOG) { + if (am_daemon || code == FLOG) return; - } - if (code == FERROR) { + if (code == FINFO && !am_server) + f = stdout; + else f = stderr; - } - - if (code == FINFO) { - if (am_server) - f = stderr; - else - f = stdout; - } - if (!f) exit_cleanup(RERR_MESSAGEIO); fflush(f); } - - -/* a generic logging routine for send/recv, with parameter - * substitiution */ -static void log_formatted(enum logcode code, char *format, char *op, - struct file_struct *file, struct stats *initial_stats, - int iflags, char *hlink) +/* A generic logging routine for send/recv, with parameter substitiution. */ +static void log_formatted(enum logcode code, const char *format, const char *op, + struct file_struct *file, const char *fname, + struct stats *initial_stats, int iflags, + const char *hlink) { char buf[MAXPATHLEN+1024], buf2[MAXPATHLEN], fmt[32]; - char *p, *s, *n; + char *p, *s, *c; + const char *n; size_t len, total; int64 b; *fmt = '%'; /* We expand % codes one by one in place in buf. We don't - * copy in the terminating nul of the inserted strings, but - * rather keep going until we reach the nul of the format. */ + * copy in the terminating null of the inserted strings, but + * rather keep going until we reach the null of the format. */ total = strlcpy(buf, format, sizeof buf); - + if (total > MAXPATHLEN) { + rprintf(FERROR, "log-format string is WAY too long!\n"); + exit_cleanup(RERR_MESSAGEIO); + } + buf[total++] = '\n'; + buf[total] = '\0'; + for (p = buf; (p = strchr(p, '%')) != NULL; ) { s = p++; - n = fmt + 1; + c = fmt + 1; if (*p == '-') - *n++ = *p++; - while (isdigit(*(uchar*)p) && n - fmt < (int)(sizeof fmt) - 8) - *n++ = *p++; + *c++ = *p++; + while (isDigit(p) && c - fmt < (int)(sizeof fmt) - 8) + *c++ = *p++; if (!*p) break; - *n = '\0'; + *c = '\0'; n = NULL; - switch (*p++) { - case 'h': if (am_daemon) n = client_name(0); break; - case 'a': if (am_daemon) n = client_addr(0); break; + switch (*p) { + 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, - (double)file->length); + (double)F_LENGTH(file)); n = buf2; break; + case 'U': + strlcat(fmt, "u", sizeof fmt); + snprintf(buf2, sizeof buf2, fmt, + uid_ndx ? F_OWNER(file) : 0); + n = buf2; + break; + case 'G': + if (!gid_ndx || file->flags & FLAG_SKIP_GROUP) + n = "DEFAULT"; + else { + strlcat(fmt, "u", sizeof fmt); + snprintf(buf2, sizeof buf2, fmt, + F_GROUP(file)); + n = buf2; + } + break; case 'p': - strlcat(fmt, "d", sizeof fmt); + strlcat(fmt, "ld", sizeof fmt); snprintf(buf2, sizeof buf2, fmt, - (int)getpid()); + (long)getpid()); n = buf2; break; - case 'o': n = op; break; + case 'M': + n = c = timestring(file->modtime); + while ((c = strchr(p, ' ')) != NULL) + *c = '-'; + break; + case 'B': + c = buf2 + MAXPATHLEN - PERMSTRING_SIZE - 1; + permstring(c, file->mode); + n = c + 1; /* skip the type char */ + break; + case 'o': + n = op; + break; case 'f': - n = safe_fname(f_name(file)); - if (am_sender && file->dir.root) { + if (fname) { + c = f_name_buf(); + strlcpy(c, fname, MAXPATHLEN); + } else + c = f_name(file, NULL); + if (am_sender && F_PATHNAME(file)) { pathjoin(buf2, sizeof buf2, - file->dir.root, n); - /* The buffer from safe_fname() has more - * room than MAXPATHLEN, so this is safe. */ - if (fmt[1]) - strcpy(n, buf2); - else + F_PATHNAME(file), c); + clean_fname(buf2, 0); + if (fmt[1]) { + strlcpy(c, buf2, MAXPATHLEN); + n = c; + } else n = buf2; + } else if (am_daemon && *c != '/') { + pathjoin(buf2, sizeof buf2, + curr_dir + module_dirlen, c); + clean_fname(buf2, 0); + if (fmt[1]) { + strlcpy(c, buf2, MAXPATHLEN); + n = c; + } else + n = buf2; + } else { + clean_fname(c, 0); + n = c; } - 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, "/"); - } + if (fname) { + c = f_name_buf(); + strlcpy(c, fname, MAXPATHLEN); + } else + c = f_name(file, NULL); + if (S_ISDIR(file->mode)) + strlcat(c, "/", MAXPATHLEN); + n = c; break; case 'L': if (hlink && *hlink) { - snprintf(buf2, sizeof buf2, " => %s", - safe_fname(hlink)); - n = buf2; - } else if (S_ISLNK(file->mode) && file->u.link) { - snprintf(buf2, sizeof buf2, " -> %s", - safe_fname(file->u.link)); - n = buf2; - } else + n = hlink; + strlcpy(buf2, " => ", sizeof buf2); + } else if (S_ISLNK(file->mode) && !fname) { + n = F_SYMLINK(file); + strlcpy(buf2, " -> ", sizeof buf2); + } else { n = ""; + if (!fmt[1]) + break; + strlcpy(buf2, " ", sizeof buf2); + } + strlcat(fmt, "s", sizeof fmt); + 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 = module_dir; + 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': - strlcat(fmt, ".0f", sizeof fmt); if (am_sender) { b = stats.total_written - initial_stats->total_written; @@ -441,11 +604,11 @@ static void log_formatted(enum logcode code, char *format, char *op, b = stats.total_read - initial_stats->total_read; } + strlcat(fmt, ".0f", sizeof fmt); snprintf(buf2, sizeof buf2, fmt, (double)b); n = buf2; break; case 'c': - strlcat(fmt, ".0f", sizeof fmt); if (!am_sender) { b = stats.total_written - initial_stats->total_written; @@ -453,6 +616,7 @@ static void log_formatted(enum logcode code, char *format, char *op, b = stats.total_read - initial_stats->total_read; } + strlcat(fmt, ".0f", sizeof fmt); snprintf(buf2, sizeof buf2, fmt, (double)b); n = buf2; break; @@ -461,39 +625,41 @@ static void log_formatted(enum logcode code, char *format, char *op, n = "*deleting"; break; } - n = buf2 + MAXPATHLEN - 32; - n[0] = iflags & ITEM_LOCAL_CHANGE + n = c = buf2 + MAXPATHLEN - 32; + c[0] = iflags & ITEM_LOCAL_CHANGE ? iflags & ITEM_XNAME_FOLLOWS ? 'h' : 'c' : !(iflags & ITEM_TRANSFER) ? '.' : !local_server && *op == 's' ? '<' : '>'; - n[1] = S_ISDIR(file->mode) ? 'd' + c[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'; - n[3] = !(iflags & ITEM_REPORT_SIZE) ? '.' : 's'; - n[4] = !(iflags & ITEM_REPORT_TIME) ? '.' - : !preserve_times || IS_DEVICE(file->mode) - || S_ISLNK(file->mode) ? 'T' : 't'; - n[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p'; - n[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o'; - n[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g'; - n[8] = !(iflags & ITEM_REPORT_XATTRS) ? '.' : 'a'; - n[9] = '\0'; + c[2] = !(iflags & ITEM_REPORT_CHECKSUM) ? '.' : 'c'; + c[3] = !(iflags & ITEM_REPORT_SIZE) ? '.' : 's'; + c[4] = !(iflags & ITEM_REPORT_TIME) ? '.' + : !preserve_times || S_ISLNK(file->mode) ? 'T' : 't'; + c[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p'; + c[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o'; + c[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g'; + c[8] = !(iflags & ITEM_REPORT_ATIME) ? '.' : 'u'; + c[9] = !(iflags & ITEM_REPORT_ACL) ? '.' : 'a'; + c[10] = !(iflags & ITEM_REPORT_XATTR) ? '.' : 'x'; + c[11] = '\0'; if (iflags & (ITEM_IS_NEW|ITEM_MISSING_DATA)) { char ch = iflags & ITEM_IS_NEW ? '+' : '?'; int i; - for (i = 2; n[i]; i++) - n[i] = ch; - } else if (!(iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE))) { + for (i = 2; c[i]; i++) + c[i] = ch; + } else if (c[0] == '.' || c[0] == 'h' || c[0] == 'c') { int i; - for (i = 2; n[i]; i++) { - if (n[i] != '.') + for (i = 2; c[i]; i++) { + if (c[i] != '.') break; } - if (!n[i]) { - for (i = 2; n[i]; i++) - n[i] = ' '; + if (!c[i]) { + for (i = 2; c[i]; i++) + c[i] = ' '; } } break; @@ -510,18 +676,18 @@ static void log_formatted(enum logcode code, char *format, char *op, len = strlen(n); /* Subtract the length of the escape from the string's size. */ - total -= p - s; + total -= p - s + 1; - if (len + total >= sizeof buf) { + if (len + total >= (size_t)sizeof buf) { rprintf(FERROR, "buffer overflow expanding %%%c -- exiting\n", - p[-1]); + p[0]); exit_cleanup(RERR_MESSAGEIO); } /* Shuffle the rest of the string along to make space for n */ - if (len != (size_t)(p - s)) - memmove(s + len, p, total - (s - buf) + 1); + if (len != (size_t)(p - s + 1)) + memmove(s + len, p + 1, total - (s - buf) + 1); total += len; /* Insert the contents of string "n", but NOT its null. */ @@ -532,9 +698,11 @@ static void log_formatted(enum logcode code, char *format, char *op, p = s + len; } - rprintf(code, "%s\n", buf); + rwrite(code, buf, total, 0); } +/* Return 1 if the format escape is in the log-format string (e.g. look for + * the 'b' in the "%9b" format escape). */ int log_format_has(const char *format, char esc) { const char *p; @@ -545,7 +713,7 @@ int log_format_has(const char *format, char esc) for (p = format; (p = strchr(p, '%')) != NULL; ) { if (*++p == '-') p++; - while (isdigit(*(uchar*)p)) + while (isDigit(p)) p++; if (!*p) break; @@ -555,62 +723,72 @@ int log_format_has(const char *format, char esc) return 0; } -/* log the transfer of a file */ -void log_item(struct file_struct *file, struct stats *initial_stats, - int iflags, char *hlink) +/* Log the transfer of a file. If the code is FCLIENT, the output just goes + * to stdout. If it is FLOG, it just goes to the log file. Otherwise we + * output to both. */ +void log_item(enum logcode code, struct file_struct *file, + struct stats *initial_stats, int iflags, const char *hlink) { - char *s_or_r = am_sender ? "send" : "recv"; - - if (lp_transfer_logging(module_id)) { - 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, - file, initial_stats, iflags, hlink); + const char *s_or_r = am_sender ? "send" : "recv"; + + if (code != FLOG && stdout_format && !am_server) { + log_formatted(FCLIENT, stdout_format, s_or_r, + file, NULL, initial_stats, iflags, hlink); + } + if (code != FCLIENT && logfile_format && *logfile_format) { + log_formatted(FLOG, logfile_format, s_or_r, + file, NULL, initial_stats, iflags, hlink); } } void maybe_log_item(struct file_struct *file, int iflags, int itemizing, - char *buf) + const char *buf) { - int see_item = itemizing && (iflags || verbose > 1); + int significant_flags = iflags & SIGNIFICANT_ITEM_FLAGS; + int see_item = itemizing && (significant_flags || *buf + || stdout_format_has_i > 1 || (verbose > 1 && stdout_format_has_i)); + int local_change = iflags & ITEM_LOCAL_CHANGE && significant_flags; if (am_server) { - if (am_daemon && !dry_run && see_item) - log_item(file, &stats, iflags, buf); - } else if (see_item || iflags & ITEM_LOCAL_CHANGE || *buf - || (S_ISDIR(file->mode) && iflags & SIGNIFICANT_ITEM_FLAGS)) - log_item(file, &stats, iflags, buf); + if (logfile_name && !dry_run && see_item + && (significant_flags || logfile_format_has_i)) + log_item(FLOG, file, &stats, iflags, buf); + } else if (see_item || local_change || *buf + || (S_ISDIR(file->mode) && significant_flags)) { + enum logcode code = significant_flags || logfile_format_has_i ? FINFO : FCLIENT; + log_item(code, file, &stats, iflags, buf); + } } -void log_delete(char *fname, int mode) +void log_delete(const char *fname, int mode) { - static struct file_struct file; + static struct { + union file_extras ex[4]; /* just in case... */ + struct file_struct file; + } x; int len = strlen(fname); - char *fmt; + const char *fmt; - file.mode = mode; - file.basename = fname; + x.file.mode = mode; - if (!verbose && !log_format) + if (!verbose && !stdout_format) ; else if (am_server && protocol_version >= 29 && len < MAXPATHLEN) { if (S_ISDIR(mode)) len++; /* directories include trailing null */ - send_msg(MSG_DELETED, fname, len); + send_msg(MSG_DELETED, fname, len, am_generator); } else { - fmt = log_format_has_o_or_i ? log_format : "deleting %n"; - log_formatted(FCLIENT, fmt, "del.", &file, &stats, + fmt = stdout_format_has_o_or_i ? stdout_format : "deleting %n"; + log_formatted(FCLIENT, fmt, "del.", &x.file, fname, &stats, ITEM_DELETED, NULL); } - if (!am_daemon || dry_run || !lp_transfer_logging(module_id)) + if (!logfile_name || dry_run || !logfile_format) return; - fmt = daemon_log_format_has_o_or_i ? lp_log_format(module_id) : "deleting %n"; - log_formatted(FLOG, fmt, "del.", &file, &stats, ITEM_DELETED, NULL); + fmt = logfile_format_has_o_or_i ? logfile_format : "deleting %n"; + log_formatted(FLOG, fmt, "del.", &x.file, fname, &stats, ITEM_DELETED, NULL); } - /* * Called when the transfer is interrupted for some reason. * @@ -624,7 +802,7 @@ void log_exit(int code, const char *file, int line) (double)stats.total_written, (double)stats.total_read, (double)stats.total_size); - } else { + } else if (am_server != 2) { const char *name; name = rerr_name(code); @@ -633,11 +811,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(FWARNING, "rsync warning: %s (code %d) at %s(%d) [%s=%s]\n", + name, code, file, line, who_am_i(), RSYNC_VERSION); } 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=%s]\n", + name, code, file, line, who_am_i(), RSYNC_VERSION); } } }