-/* -*- c-file-style: "linux"; -*-
-
- Copyright (C) 1998-2001 by Andrew Tridgell <tridge@samba.org>
- Copyright (C) 2000-2001 by Martin Pool <mbp@samba.org>
-
- 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 <tridge@samba.org>
+ * Copyright (C) 2000-2001 Martin Pool <mbp@samba.org>
+ * Copyright (C) 2003-2008 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
- <mbp@samba.org>, Oct 2000.
- */
#include "rsync.h"
+#include "itypes.h"
+#include "inums.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 checksum_len;
+extern int allow_8bit_chars;
extern int protocol_version;
+extern int always_checksum;
extern int preserve_times;
-extern int log_format_has_o_or_i;
-extern int daemon_log_format_has_o_or_i;
+extern int msgs2stderr;
+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 int receiver_symlink_times;
+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_recv;
+#endif
+extern char curr_dir[MAXPATHLEN];
+extern char *module_dir;
+extern unsigned int module_dirlen;
+extern char sender_file_sum[MAX_DIGEST_LEN];
static int log_initialised;
static int logfile_was_closed;
-static char *logfname;
-static FILE *logfile;
+static FILE *logfile_fp;
struct stats stats;
-int log_got_error = 0;
+int got_xfer_error = 0;
+int output_needs_newline = 0;
struct {
int code;
{ 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_PARTIAL , "some files/attrs were not transferred (see previous errors)" },
{ RERR_VANISHED , "some files vanished before they could be transferred" },
{ RERR_TIMEOUT , "timeout in data send/receive" },
+ { RERR_CONTIMEOUT , "timeout waiting for daemon connection" },
{ RERR_CMD_FAILED , "remote shell failed" },
{ RERR_CMD_KILLED , "remote shell killed" },
{ RERR_CMD_RUN , "remote command could not be run" },
{ 0, NULL }
};
-
-
/*
* Map from rsync error code to name, or return NULL.
*/
return NULL;
}
-
-static void logit(int priority, char *buf)
+static void logit(int priority, const char *buf)
{
if (logfile_was_closed)
logfile_reopen();
- if (logfile) {
- fprintf(logfile,"%s [%d] %s",
+ 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);
}
#endif
#ifdef LOG_DAEMON
- openlog("rsyncd", options, lp_syslog_facility());
+ openlog("rsyncd", options, lp_syslog_facility(module_id));
#else
openlog("rsyncd", options);
#endif
static void logfile_open(void)
{
- extern int orig_umask;
- int old_umask = umask(022 | orig_umask);
- logfile = fopen(logfname, "a");
+ mode_t old_umask = umask(022 | orig_umask);
+ logfile_fp = fopen(logfile_name, "a");
umask(old_umask);
- if (!logfile) {
+ 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", logfname);
+ "failed to open log-file %s", logfile_name);
rprintf(FINFO, "Ignoring \"log file\" setting.\n");
}
}
-void log_init(void)
+void log_init(int restart)
{
- time_t t;
-
- if (log_initialised)
- return;
- log_initialised = 1;
+ 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
+ /* 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 && *logfname)
+ * 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) {
+ if (logfile_fp) {
logfile_was_closed = 1;
- fclose(logfile);
- logfile = NULL;
+ 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)
+static void filtered_fwrite(FILE *f, const char *buf, int len, int use_isprint)
{
- FILE *f = NULL;
- /* recursion can happen with certain fatal conditions */
+ 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);
+}
- if (quiet && code == FINFO)
- return;
+/* this is the underlying (unformatted) rsync debugging function. Call
+ * 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 = msgs2stderr ? stderr : stdout;
+#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 (msgs2stderr && code != FLOG)
+ goto output_msg;
if (am_server && msg_fd_out >= 0) {
- /* Pass the message to our sibling. */
- send_msg((enum msgcode)code, buf, len);
+ assert(!is_utf8);
+ /* Pass the message to our sibling in native charset. */
+ send_msg((enum msgcode)code, buf, len, 0);
return;
}
+ if (code == FERROR_SOCKET) /* This gets simplified for a non-sibling. */
+ code = FERROR;
+ else if (code == FERROR_UTF8) {
+ is_utf8 = 1;
+ 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? */
return;
}
+ f = stderr;
}
- if (code == FERROR) {
- log_got_error = 1;
+output_msg:
+ switch (code) {
+ case FERROR_XFER:
+ got_xfer_error = 1;
+ /* FALL THROUGH */
+ case FERROR:
+ case FWARNING:
f = stderr;
+ break;
+ case FINFO:
+ case FCLIENT:
+ break;
+ default:
+ exit_cleanup(RERR_MESSAGEIO);
}
- if (code == FINFO)
- f = am_server ? stderr : stdout;
+ if (output_needs_newline) {
+ fputc('\n', f);
+ output_needs_newline = 0;
+ }
- 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 (len && buf[0] == '\r') {
+ fputc('\r', f);
+ buf++;
+ len--;
+ }
+
+#ifdef ICONV_CONST
+ if (ic != (iconv_t)-1) {
+ xbuf outbuf, inbuf;
+ char convbuf[1024];
+ int ierrno;
+
+ INIT_CONST_XBUF(outbuf, convbuf);
+ INIT_XBUF(inbuf, (char*)buf, len, (size_t)-1);
+
+ 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 (buf[len-1] == '\r' || buf[len-1] == '\n')
+ 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);
* 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;
* 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.
*
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);
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;
- }
+ FILE *f;
- if (code == FLOG) {
+ if (am_daemon || code == FLOG)
return;
- }
- if (code == FERROR) {
+ if (!am_server && (code == FINFO || code == FCLIENT))
+ 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;
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;
+ 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);
+ strlcat(fmt, "s", sizeof fmt);
snprintf(buf2, sizeof buf2, fmt,
- (double)file->length);
+ comma_num(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, "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(c, ' ')) != 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,
+ 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,
- 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
+ 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) {
- n = safe_fname(hlink);
- strcpy(buf2, " => ");
- } else if (S_ISLNK(file->mode) && file->u.link) {
- n = safe_fname(file->u.link);
- strcpy(buf2, " -> ");
+ 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;
- strcpy(buf2, " ");
+ 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 = 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 = module_dir;
+ break;
+ case 'u':
+ n = auth_user;
+ break;
case 'b':
if (am_sender) {
b = stats.total_written -
b = stats.total_read -
initial_stats->total_read;
}
- strlcat(fmt, ".0f", sizeof fmt);
- snprintf(buf2, sizeof buf2, fmt, (double)b);
+ strlcat(fmt, "s", sizeof fmt);
+ snprintf(buf2, sizeof buf2, fmt, comma_num(b));
n = buf2;
break;
case 'c':
b = stats.total_read -
initial_stats->total_read;
}
- strlcat(fmt, ".0f", sizeof fmt);
- snprintf(buf2, sizeof buf2, fmt, (double)b);
+ strlcat(fmt, "s", sizeof fmt);
+ snprintf(buf2, sizeof buf2, fmt, comma_num(b));
+ n = buf2;
+ break;
+ case 'C':
+ if (protocol_version >= 30
+ && (iflags & ITEM_TRANSFER
+ || (always_checksum && S_ISREG(file->mode)))) {
+ int i, x1, x2;
+ const char *sum = iflags & ITEM_TRANSFER
+ ? sender_file_sum : F_SUM(file);
+ c = buf2 + checksum_len*2;
+ *c = '\0';
+ for (i = checksum_len; --i >= 0; ) {
+ x1 = CVAL(sum, i);
+ x2 = x1 >> 4;
+ x1 &= 0xF;
+ *--c = x1 <= 9 ? x1 + '0' : x1 + 'a' - 10;
+ *--c = x2 <= 9 ? x2 + '0' : x2 + 'a' - 10;
+ }
+ } else {
+ memset(buf2, ' ', checksum_len*2);
+ buf2[checksum_len*2] = '\0';
+ }
n = buf2;
break;
case 'i':
if (iflags & ITEM_DELETED) {
- n = "*deleting";
+ 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'
- : 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';
+ if (S_ISLNK(file->mode)) {
+ c[1] = 'L';
+ c[3] = '.';
+ c[4] = !(iflags & ITEM_REPORT_TIME) ? '.'
+ : !preserve_times || !receiver_symlink_times
+ || (iflags & ITEM_REPORT_TIMEFAIL) ? 'T' : 't';
+ } else {
+ c[1] = S_ISDIR(file->mode) ? 'd'
+ : IS_SPECIAL(file->mode) ? 'S'
+ : IS_DEVICE(file->mode) ? 'D' : 'f';
+ c[3] = !(iflags & ITEM_REPORT_SIZE) ? '.' : 's';
+ c[4] = !(iflags & ITEM_REPORT_TIME) ? '.'
+ : !preserve_times ? 'T' : 't';
+ }
+ c[2] = !(iflags & ITEM_REPORT_CHANGE) ? '.' : 'c';
+ 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 (n[0] == '.' || n[0] == 'h') {
+ 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;
p = s + len;
}
- rwrite(code, buf, total);
+ rwrite(code, buf, total, 0);
}
/* Return 1 if the format escape is in the log-format string (e.g. look for
for (p = format; (p = strchr(p, '%')) != NULL; ) {
if (*++p == '-')
p++;
- while (isdigit(*(uchar*)p))
+ while (isDigit(p))
p++;
if (!*p)
break;
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 significant_flags = iflags & SIGNIFICANT_ITEM_FLAGS;
- int see_item = itemizing && (significant_flags || *buf || verbose > 1);
- int local_change = iflags & ITEM_LOCAL_CHANGE
- && (!(iflags & ITEM_XNAME_FOLLOWS) || significant_flags);
+ int see_item = itemizing && (significant_flags || *buf
+ || stdout_format_has_i > 1 || (INFO_GTE(NAME, 2) && 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);
+ 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))
- log_item(file, &stats, iflags, 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 (!INFO_GTE(DEL, 1) && !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.
*
void log_exit(int code, const char *file, int line)
{
if (code == 0) {
- rprintf(FLOG,"sent %.0f bytes received %.0f bytes total size %.0f\n",
- (double)stats.total_written,
- (double)stats.total_read,
- (double)stats.total_size);
- } else {
+ rprintf(FLOG,"sent %s bytes received %s bytes total size %s\n",
+ comma_num(stats.total_written),
+ comma_num(stats.total_read),
+ comma_num(stats.total_size));
+ } else if (am_server != 2) {
const char *name;
name = rerr_name(code);
/* 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);
}
}
}
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff