X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/548abf96ce4d2618d39837daec320861de0be610..aac5cab80b9d4fc0adff2b72aeba2406176930ae:/log.c diff --git a/log.c b/log.c index 2bb145a1..fedeacdb 100644 --- a/log.c +++ b/log.c @@ -1,47 +1,65 @@ -/* -*- 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, 2004, 2005, 2006 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 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., + * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. + */ - Mapping to human-readable messages added by Martin Pool - , Oct 2000. - */ #include "rsync.h" +#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H +#include +#endif +extern int verbose; +extern int dry_run; extern int am_daemon; extern int am_server; extern int am_sender; +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 preserve_uid; +extern int preserve_gid; +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; +#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H +extern iconv_t ic_chck; +#endif +extern char curr_dir[]; +extern unsigned int module_dirlen; static int log_initialised; -static char *logfname; -static FILE *logfile; -static int log_error_fd = -1; +static int logfile_was_closed; +static FILE *logfile_fp; struct stats stats; -int log_got_error=0; +int log_got_error = 0; struct { int code; @@ -57,21 +75,23 @@ struct { { 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 transfered" }, + { RERR_VANISHED , "some files vanished before they could be transferred" }, { RERR_TIMEOUT , "timeout in data send/receive" }, { RERR_CMD_FAILED , "remote shell failed" }, { RERR_CMD_KILLED , "remote shell killed" }, - { RERR_CMD_RUN, "remote command could not be run" }, - { RERR_CMD_NOTFOUND, "remote command not found" }, + { RERR_CMD_RUN , "remote command could not be run" }, + { RERR_CMD_NOTFOUND,"remote command not found" }, + { RERR_DEL_LIMIT , "the --max-delete limit stopped deletions" }, { 0, NULL } }; - - /* * Map from rsync error code to name, or return NULL. */ @@ -85,250 +105,270 @@ static char const *rerr_name(int code) return NULL; } -struct err_list { - struct err_list *next; - char *buf; - int len; - int written; /* how many bytes we have written so far */ -}; - -static struct err_list *err_list_head; -static struct err_list *err_list_tail; - -/* add an error message to the pending error list */ -static void err_list_add(int code, char *buf, int len) +static void logit(int priority, const char *buf) { - struct err_list *el; - el = new(struct err_list); - if (!el) exit_cleanup(RERR_MALLOC); - el->next = NULL; - el->buf = new_array(char, len+4); - if (!el->buf) exit_cleanup(RERR_MALLOC); - memcpy(el->buf+4, buf, len); - SIVAL(el->buf, 0, ((code+MPLEX_BASE)<<24) | len); - el->len = len+4; - el->written = 0; - if (err_list_tail) { - err_list_tail->next = el; - } else { - err_list_head = el; - } - err_list_tail = el; -} - - -/* try to push errors off the error list onto the wire */ -void err_list_push(void) -{ - if (log_error_fd == -1) return; - - while (err_list_head) { - struct err_list *el = err_list_head; - int n = write(log_error_fd, el->buf+el->written, el->len - el->written); - /* don't check for an error if the best way of handling the error is - * to ignore it */ - if (n == -1) break; - if (n > 0) { - el->written += n; - } - if (el->written == el->len) { - free(el->buf); - err_list_head = el->next; - if (!err_list_head) err_list_tail = NULL; - free(el); - } - } -} - - -static void logit(int priority, 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) 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; - } + if (been_here) + return; + 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); + 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 (logfile) { - fclose(logfile); - logfile = NULL; - } + 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(); } -/* setup the error file descriptor - used when we are a server - * that is receiving files */ -void set_error_fd(int fd) +void logfile_close(void) { - log_error_fd = fd; - set_nonblocking(log_error_fd); + if (logfile_fp) { + logfile_was_closed = 1; + fclose(logfile_fp); + logfile_fp = NULL; + } } -/* this is the underlying (unformatted) rsync debugging function. Call - * it with FINFO, FERROR or FLOG */ -void rwrite(enum logcode code, char *buf, int len) +void logfile_reopen(void) { - FILE *f=NULL; - /* recursion can happen with certain fatal conditions */ - - if (quiet && code == FINFO) return; - - if (len < 0) exit_cleanup(RERR_MESSAGEIO); - - buf[len] = 0; - - if (code == FLOG) { - if (am_daemon) logit(LOG_INFO, buf); - return; + if (logfile_was_closed) { + logfile_was_closed = 0; + logfile_open(); } +} - /* first try to pass it off to our sibling */ - if (am_server && log_error_fd != -1) { - err_list_add(code, buf, len); - err_list_push(); - return; +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); +} - /* next, if we are a server and multiplexing is enabled, - * pass it to the other side. */ - if (am_server && io_multiplex_write(code, buf, len)) { +/* this is the underlying (unformatted) rsync debugging function. Call + * it with FINFO, FERROR or FLOG. Note: recursion can happen with + * certain fatal conditions. */ +void rwrite(enum logcode code, const char *buf, int len) +{ + int trailing_CR_or_NL; + FILE *f = NULL; + + if (len < 0) + exit_cleanup(RERR_MESSAGEIO); + + if (am_server && msg_fd_out >= 0) { + /* Pass the message to our sibling. */ + send_msg((enum msgcode)code, buf, len); return; } - /* otherwise, if in daemon mode and either we are not a server - * (that is, we are not running --daemon over a remote shell) or - * the log has already been initialised, log the message on this - * side because we don't want the client to see most errors for - * security reasons. We do want early messages when running daemon - * mode over a remote shell to go to the remote side; those will - * fall through to the next case. - * Note that this is only for the time before multiplexing is enabled. - */ - if (am_daemon && (!am_server || log_initialised)) { - static int depth; - int priority = LOG_INFO; - if (code == FERROR) priority = LOG_WARNING; - - if (depth) return; + if (code == FSOCKERR) /* This gets simplified for a non-sibling. */ + code = FERROR; - depth++; + if (code == FCLIENT) + code = FINFO; + else if (am_daemon || logfile_name) { + static int in_block; + char msg[2048]; + int priority = code == FERROR ? LOG_WARNING : LOG_INFO; - log_init(); - logit(priority, buf); + if (in_block) + return; + in_block = 1; + if (!log_initialised) + log_init(0); + strlcpy(msg, buf, MIN((int)sizeof msg, len + 1)); + logit(priority, msg); + in_block = 0; + + if (code == FLOG || (am_daemon && !am_server)) + return; + } else if (code == FLOG) + return; - depth--; + if (quiet && code != FERROR) return; + + if (am_server) { + /* Pass the message to the non-server side. */ + if (send_msg((enum msgcode)code, buf, len)) + return; + if (am_daemon) { + /* TODO: can we send the error to the user somehow? */ + return; + } } - if (code == FERROR) { + switch (code) { + case FERROR: log_got_error = 1; f = stderr; + break; + case FINFO: + f = am_server ? stderr : stdout; + break; + default: + exit_cleanup(RERR_MESSAGEIO); } - if (code == FINFO) { - if (am_server) - f = stderr; - else - f = stdout; - } - - if (!f) exit_cleanup(RERR_MESSAGEIO); + trailing_CR_or_NL = len && (buf[len-1] == '\n' || buf[len-1] == '\r') + ? buf[--len] : 0; - if (fwrite(buf, len, 1, f) != 1) exit_cleanup(RERR_MESSAGEIO); +#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H +#ifndef ICONV_CONST +#define ICONV_CONST +#endif + if (ic_chck != (iconv_t)-1) { + char convbuf[1024]; + ICONV_CONST char *in_buf = (ICONV_CONST char *)buf; + char *out_buf = convbuf; + size_t in_cnt = len, out_cnt = sizeof convbuf - 1; + + iconv(ic_chck, NULL, 0, NULL, 0); + while (iconv(ic_chck, &in_buf,&in_cnt, + &out_buf,&out_cnt) == (size_t)-1) { + if (out_buf != convbuf) { + filtered_fwrite(f, convbuf, out_buf - convbuf, 0); + out_buf = convbuf; + out_cnt = sizeof convbuf - 1; + } + if (errno == E2BIG) + continue; + fprintf(f, "\\#%03o", *(uchar*)in_buf++); + in_cnt--; + } + if (out_buf != convbuf) + filtered_fwrite(f, convbuf, out_buf - convbuf, 0); + } else +#endif + filtered_fwrite(f, buf, len, !allow_8bit_chars); - if (buf[len-1] == '\r' || buf[len-1] == '\n') fflush(f); + 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. */ void rprintf(enum logcode code, const char *format, ...) { va_list ap; - char buf[1024]; - int len; + char buf[BIGPATHBUFLEN]; + size_t len; va_start(ap, format); - /* Note: might return -1 */ - len = vsnprintf(buf, sizeof(buf), format, ap); + len = vsnprintf(buf, sizeof buf, format, ap); va_end(ap); /* Deal with buffer overruns. Instead of panicking, just - * truncate the resulting string. Note that some vsnprintf()s - * return -1 on truncation, e.g., glibc 2.0.6 and earlier. */ - if ((size_t) len > sizeof(buf)-1 || len < 0) { - const char ellipsis[] = "[...]"; + * truncate the resulting string. (Note that configure ensures + * that we have a vsnprintf() that doesn't ever return -1.) */ + if (len > sizeof buf - 1) { + static const char ellipsis[] = "[...]"; /* Reset length, and zero-terminate the end of our buffer */ - len = sizeof(buf)-1; + len = sizeof buf - 1; buf[len] = '\0'; /* Copy the ellipsis to the end of the string, but give * us one extra character: * - * v--- null byte at buf[sizeof(buf)-1] + * v--- null byte at buf[sizeof buf - 1] * abcdefghij0 * -> abcd[...]00 <-- now two null bytes at end * * 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'; } @@ -337,7 +377,6 @@ void rprintf(enum logcode code, const char *format, ...) rwrite(code, buf, len); } - /* This is like rprintf, but it also tries to print some * representation of the error code. Normally errcode = errno. * @@ -349,117 +388,198 @@ void rprintf(enum logcode code, const char *format, ...) void rsyserr(enum logcode code, int errcode, const char *format, ...) { va_list ap; - char buf[1024]; - int len; - size_t sys_len; - char *sysmsg; + char buf[BIGPATHBUFLEN]; + size_t len; + + strlcpy(buf, RSYNC_NAME ": ", sizeof buf); + len = (sizeof RSYNC_NAME ": ") - 1; va_start(ap, format); - /* Note: might return <0 */ - len = vsnprintf(buf, sizeof(buf), format, ap); + len += vsnprintf(buf + len, sizeof buf - len, format, ap); va_end(ap); - /* TODO: Put in RSYNC_NAME at the start. */ - - if ((size_t) len > sizeof(buf)-1) - exit_cleanup(RERR_MESSAGEIO); - - sysmsg = strerror(errcode); - sys_len = strlen(sysmsg); - if ((size_t) len + 3 + sys_len > sizeof(buf) - 1) + if (len < sizeof buf) { + len += snprintf(buf + len, sizeof buf - len, + ": %s (%d)\n", strerror(errcode), errcode); + } + if (len >= sizeof buf) exit_cleanup(RERR_MESSAGEIO); - strcpy(buf + len, ": "); - len += 2; - strcpy(buf + len, sysmsg); - len += sys_len; - strcpy(buf + len, "\n"); - len++; - rwrite(code, buf, len); } - - 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 == FERROR || am_server) f = stderr; - } + else + f = stdout; - 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) +/* 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[1024]; - char buf2[1024]; - char *p, *s, *n; - size_t l; + char buf[MAXPATHLEN+1024], buf2[MAXPATHLEN], fmt[32]; + 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. - * Just to make sure we don't clobber that nul and therefore - * accidentally keep going, we zero the buffer now. */ - memset(buf, 0, sizeof buf); - strlcpy(buf, format, sizeof(buf)); - - for (s = &buf[0]; s && (p = strchr(s,'%')); ) { + * 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++; + c = fmt + 1; + if (*p == '-') + *c++ = *p++; + while (isDigit(p) && c - fmt < (int)(sizeof fmt) - 8) + *c++ = *p++; + if (!*p) + break; + *c = '\0'; n = NULL; - s = p + 1; - switch (p[1]) { - 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': - snprintf(buf2,sizeof(buf2),"%.0f", - (double)file->length); + strlcat(fmt, ".0f", sizeof fmt); + snprintf(buf2, sizeof buf2, fmt, + (double)F_LENGTH(file)); + n = buf2; + break; + case 'U': + strlcat(fmt, "ld", sizeof fmt); + snprintf(buf2, sizeof buf2, fmt, + preserve_uid ? (long)F_UID(file) : 0); n = buf2; break; + case 'G': + if (!preserve_gid || F_GID(file) == GID_NONE) + n = "DEFAULT"; + else { + strlcat(fmt, "ld", sizeof fmt); + snprintf(buf2, sizeof buf2, fmt, + (long)F_GID(file)); + n = buf2; + } + break; case 'p': - snprintf(buf2,sizeof(buf2),"%d", - (int)getpid()); + strlcat(fmt, "ld", sizeof fmt); + snprintf(buf2, sizeof buf2, fmt, + (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': - snprintf(buf2, sizeof(buf2), "%s/%s", - file->basedir?file->basedir:"", - f_name(file)); - clean_fname(buf2); + if (fname) { + c = f_name_buf(); + strlcpy(c, fname, MAXPATHLEN); + } else + c = f_name(file, NULL); + if (am_sender && file->dir.root) { + pathjoin(buf2, sizeof buf2, + file->dir.root, c); + clean_fname(buf2, 0); + if (fmt[1]) { + strlcpy(c, buf2, MAXPATHLEN); + n = c; + } else + n = buf2; + } else if (*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; + } + if (*n == '/') + n++; + break; + case '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) { + 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; - if (*n == '/') n++; 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 - @@ -468,7 +588,8 @@ static void log_formatted(enum logcode code, b = stats.total_read - initial_stats->total_read; } - snprintf(buf2,sizeof(buf2),"%.0f", (double)b); + strlcat(fmt, ".0f", sizeof fmt); + snprintf(buf2, sizeof buf2, fmt, (double)b); n = buf2; break; case 'c': @@ -479,63 +600,176 @@ static void log_formatted(enum logcode code, b = stats.total_read - initial_stats->total_read; } - snprintf(buf2,sizeof(buf2),"%.0f", (double)b); + strlcat(fmt, ".0f", sizeof fmt); + snprintf(buf2, sizeof buf2, fmt, (double)b); n = buf2; break; + case 'i': + if (iflags & ITEM_DELETED) { + n = "*deleting"; + break; + } + n = c = buf2 + MAXPATHLEN - 32; + c[0] = iflags & ITEM_LOCAL_CHANGE + ? iflags & ITEM_XNAME_FOLLOWS ? 'h' : 'c' + : !(iflags & ITEM_TRANSFER) ? '.' + : !local_server && *op == 's' ? '<' : '>'; + c[1] = S_ISDIR(file->mode) ? 'd' + : IS_SPECIAL(file->mode) ? 'S' + : IS_DEVICE(file->mode) ? 'D' + : S_ISLNK(file->mode) ? 'L' : 'f'; + 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] = '.'; + c[9] = '\0'; + + if (iflags & (ITEM_IS_NEW|ITEM_MISSING_DATA)) { + char ch = iflags & ITEM_IS_NEW ? '+' : '?'; + int i; + for (i = 2; c[i]; i++) + c[i] = ch; + } else if (c[0] == '.' || c[0] == 'h' || c[0] == 'c') { + int i; + for (i = 2; c[i]; i++) { + if (c[i] != '.') + break; + } + if (!c[i]) { + for (i = 2; c[i]; i++) + c[i] = ' '; + } + } + break; } - /* n is the string to be inserted in place of this % - * code; l is its length not including the trailing - * NUL */ + /* "n" is the string to be inserted in place of this % code. */ if (!n) continue; + if (n != buf2 && fmt[1]) { + strlcat(fmt, "s", sizeof fmt); + snprintf(buf2, sizeof buf2, fmt, n); + n = buf2; + } + len = strlen(n); - l = strlen(n); + /* Subtract the length of the escape from the string's size. */ + total -= p - s + 1; - if (l + ((int)(s - &buf[0])) >= sizeof(buf)) { - rprintf(FERROR,"buffer overflow expanding %%%c - exiting\n", + if (len + total >= (size_t)sizeof buf) { + rprintf(FERROR, + "buffer overflow expanding %%%c -- exiting\n", p[0]); exit_cleanup(RERR_MESSAGEIO); } /* Shuffle the rest of the string along to make space for n */ - if (l != 2) { - memmove(s+(l-1), s+1, strlen(s+1)+1); - } + if (len != (size_t)(p - s + 1)) + memmove(s + len, p + 1, total - (s - buf) + 1); + total += len; - /* Copy in n but NOT its nul, because the format sting - * probably continues after this. */ - memcpy(p, n, l); + /* Insert the contents of string "n", but NOT its null. */ + if (len) + memcpy(s, n, len); /* Skip over inserted string; continue looking */ - s = p+l; + p = s + len; } - rprintf(code,"%s\n", buf); + rwrite(code, buf, total); } -/* log the outgoing transfer of a file */ -void log_send(struct file_struct *file, struct stats *initial_stats) +/* 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) { - if (lp_transfer_logging(module_id)) { - log_formatted(FLOG, lp_log_format(module_id), "send", file, initial_stats); - } else if (log_format && !am_server) { - log_formatted(FINFO, log_format, "send", file, initial_stats); + const char *p; + + if (!format) + return 0; + + for (p = format; (p = strchr(p, '%')) != NULL; ) { + if (*++p == '-') + p++; + while (isDigit(p)) + p++; + if (!*p) + break; + if (*p == esc) + return 1; } + return 0; } -/* log the incoming transfer of a file */ -void log_recv(struct file_struct *file, struct stats *initial_stats) +/* 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) { - if (lp_transfer_logging(module_id)) { - log_formatted(FLOG, lp_log_format(module_id), "recv", file, initial_stats); - } else if (log_format && !am_server) { - log_formatted(FINFO, log_format, "recv", file, initial_stats); + 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, + const char *buf) +{ + 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 (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(const char *fname, int mode) +{ + static struct { + union file_extras ex[4]; /* just in case... */ + struct file_struct file; + } x; + int len = strlen(fname); + const char *fmt; + + x.file.mode = mode; + + 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); + } else { + fmt = stdout_format_has_o_or_i ? stdout_format : "deleting %n"; + log_formatted(FCLIENT, fmt, "del.", &x.file, fname, &stats, + ITEM_DELETED, NULL); + } + if (!logfile_name || dry_run || !logfile_format) + return; + 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. @@ -546,7 +780,7 @@ void log_recv(struct file_struct *file, struct stats *initial_stats) void log_exit(int code, const char *file, int line) { if (code == 0) { - rprintf(FLOG,"wrote %.0f bytes read %.0f bytes total size %.0f\n", + rprintf(FLOG,"sent %.0f bytes received %.0f bytes total size %.0f\n", (double)stats.total_written, (double)stats.total_read, (double)stats.total_size); @@ -559,11 +793,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=%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); } } }