*/
#include "rsync.h"
+extern int dry_run;
extern int am_daemon;
extern int am_server;
extern int am_sender;
extern int quiet;
extern int module_id;
extern int msg_fd_out;
+extern int preserve_times;
extern char *auth_user;
extern char *log_format;
{ RERR_WAITCHILD , "some error returned by waitpid()" },
{ 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" },
return NULL;
}
+static void log_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_FILESELECT);
+ }
+ }
+}
static void logit(int priority, char *buf)
{
int options = LOG_PID;
time_t t;
- if (log_initialised) return;
+ if (log_initialised)
+ return;
log_initialised = 1;
/* this looks pointless, but it is needed in order for the
#endif
}
-void log_open(void)
-{
- if (logfname && !logfile) {
- extern int orig_umask;
- int old_umask = umask(022 | orig_umask);
- logfile = fopen(logfname, "a");
- umask(old_umask);
- }
-}
-
void log_close(void)
{
if (logfile) {
buf[len] = 0;
- if (code == FLOG) {
- if (am_daemon) logit(LOG_INFO, buf);
+ if (am_server && msg_fd_out >= 0) {
+ /* Pass the message to our sibling. */
+ send_msg((enum msgcode)code, buf, len);
return;
}
- if (am_server) {
- /* Pass it to non-server side, perhaps through our sibling. */
- if (msg_fd_out >= 0) {
- send_msg((enum msgcode)code, buf, len);
+ if (am_daemon) {
+ static int in_block;
+ char msg[2048];
+ int priority = code == FERROR ? LOG_WARNING : LOG_INFO;
+
+ if (in_block)
return;
- }
- if (!am_daemon
- && io_multiplex_write((enum msgcode)code, buf, len))
+ in_block = 1;
+ if (!log_initialised)
+ log_init();
+ strlcpy(msg, buf, MIN((int)sizeof msg, len + 1));
+ logit(priority, msg);
+ in_block = 0;
+
+ if (code == FLOG || !am_server)
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;
-
- depth++;
-
- log_init();
- logit(priority, buf);
-
- depth--;
+ } else if (code == FLOG)
return;
+
+ if (am_server) {
+ /* Pass the message to the non-server side. */
+ if (io_multiplex_write((enum msgcode)code, buf, len))
+ return;
+ if (am_daemon) {
+ /* TODO: can we send the error to the user somehow? */
+ return;
+ }
}
if (code == FERROR) {
f = stderr;
}
- if (code == FINFO) {
- if (am_server)
- f = stderr;
- else
- f = stdout;
- }
+ if (code == FINFO)
+ f = am_server ? stderr : stdout;
- if (!f) exit_cleanup(RERR_MESSAGEIO);
+ if (!f)
+ exit_cleanup(RERR_MESSAGEIO);
- if (fwrite(buf, len, 1, f) != 1) exit_cleanup(RERR_MESSAGEIO);
+ if (fwrite(buf, len, 1, f) != 1)
+ exit_cleanup(RERR_MESSAGEIO);
- if (buf[len-1] == '\r' || buf[len-1] == '\n') fflush(f);
+ if (buf[len-1] == '\r' || buf[len-1] == '\n')
+ fflush(f);
}
size_t len;
va_start(ap, format);
- 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
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));
+ strncpy(buf+len-sizeof ellipsis, ellipsis, sizeof ellipsis);
if (format[strlen(format)-1] == '\n') {
buf[len-1] = '\n';
}
* substitiution */
static void log_formatted(enum logcode code,
char *format, char *op, struct file_struct *file,
- struct stats *initial_stats)
+ struct stats *initial_stats, int iflags)
{
- char buf[1024];
+ char buf[MAXPATHLEN+1024];
char buf2[1024];
- char *p, *s, *n;
- size_t l;
+ char *p, *n;
+ size_t len, total;
int64 b;
/* 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. */
- l = strlcpy(buf, format, sizeof buf);
- if (l < sizeof buf)
- memset(buf + l, 0, sizeof buf - l);
+ * rather keep going until we reach the nul of the format. */
+ total = strlcpy(buf, format, sizeof buf);
- for (s = &buf[0]; s && (p = strchr(s,'%')); ) {
+ for (p = buf; (p = strchr(p, '%')) != NULL && p[1]; ) {
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;
case 'l':
- snprintf(buf2,sizeof(buf2),"%.0f",
+ snprintf(buf2, sizeof buf2, "%.0f",
(double)file->length);
n = buf2;
break;
case 'p':
- snprintf(buf2,sizeof(buf2),"%d",
+ snprintf(buf2, sizeof buf2, "%d",
(int)getpid());
n = buf2;
break;
case 'o': n = op; break;
case 'f':
pathjoin(buf2, sizeof buf2,
- file->basedir ? file->basedir : "",
- f_name(file));
- clean_fname(buf2);
+ am_sender && file->dir.root ? file->dir.root : "",
+ safe_fname(f_name(file)));
+ clean_fname(buf2, 0);
n = buf2;
if (*n == '/') n++;
break;
+ case 'n':
+ n = (char*)safe_fname(f_name(file));
+ break;
+ case 'L':
+ if (S_ISLNK(file->mode)) {
+ snprintf(buf2, sizeof buf2, " -> %s",
+ safe_fname(file->u.link));
+ n = buf2;
+ } else
+ 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;
b = stats.total_read -
initial_stats->total_read;
}
- snprintf(buf2,sizeof(buf2),"%.0f", (double)b);
+ snprintf(buf2, sizeof buf2, "%.0f", (double)b);
n = buf2;
break;
case 'c':
b = stats.total_read -
initial_stats->total_read;
}
- snprintf(buf2,sizeof(buf2),"%.0f", (double)b);
+ snprintf(buf2, sizeof buf2, "%.0f", (double)b);
+ n = buf2;
+ break;
+ case 'i':
n = buf2;
+ n[0] = !(iflags & ITEM_UPDATING) ? ' ' : dry_run
+ ? '*' : *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] = '\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;
+ }
break;
}
/* n is the string to be inserted in place of this %
- * code; l is its length not including the trailing
+ * code; len is its length not including the trailing
* NUL */
- if (!n)
+ if (!n) {
+ p += 2;
continue;
+ }
- l = strlen(n);
+ len = strlen(n);
- if (l + ((int)(s - &buf[0])) >= sizeof(buf)) {
- rprintf(FERROR,"buffer overflow expanding %%%c - exiting\n",
+ if (len + total - 2 >= 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 != 2)
+ memmove(p + len, p + 2, total - (p + 2 - buf) + 1);
+ total += len - 2;
- /* 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 nul. */
+ if (len)
+ memcpy(p, n, len);
/* Skip over inserted string; continue looking */
- s = p+l;
+ p += len;
}
- rprintf(code,"%s\n", buf);
+ rprintf(code, "%s\n", buf);
}
/* log the outgoing transfer of a file */
-void log_send(struct file_struct *file, struct stats *initial_stats)
+void log_send(struct file_struct *file, struct stats *initial_stats, int iflags)
{
if (lp_transfer_logging(module_id)) {
- log_formatted(FLOG, lp_log_format(module_id), "send", file, initial_stats);
+ log_formatted(FLOG, lp_log_format(module_id), "send",
+ file, initial_stats, iflags);
} else if (log_format && !am_server) {
- log_formatted(FINFO, log_format, "send", file, initial_stats);
+ log_formatted(FINFO, log_format, "send",
+ file, initial_stats, iflags);
}
}
/* log the incoming transfer of a file */
-void log_recv(struct file_struct *file, struct stats *initial_stats)
+void log_recv(struct file_struct *file, struct stats *initial_stats, int iflags)
{
if (lp_transfer_logging(module_id)) {
- log_formatted(FLOG, lp_log_format(module_id), "recv", file, initial_stats);
+ log_formatted(FLOG, lp_log_format(module_id), "recv",
+ file, initial_stats, iflags);
} else if (log_format && !am_server) {
- log_formatted(FINFO, log_format, "recv", file, initial_stats);
+ log_formatted(FINFO, log_format, "recv",
+ file, initial_stats, iflags);
}
}