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;
{ 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_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 }
};
if (!logfile) {
am_daemon = 0; /* avoid trying to log again */
rsyserr(FERROR, errno, "fopen() of log-file failed");
- exit_cleanup(RERR_FILESELECT);
+ exit_cleanup(RERR_LOG_FAILURE);
}
}
}
struct file_struct *file, struct stats *initial_stats,
int iflags, char *hlink)
{
- char buf[MAXPATHLEN+1024];
- char buf2[MAXPATHLEN];
- char *p, *n;
+ char buf[MAXPATHLEN+1024], buf2[MAXPATHLEN], fmt[32];
+ char *p, *s, *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. */
total = strlcpy(buf, format, sizeof buf);
for (p = buf; (p = strchr(p, '%')) != NULL && p[1]; ) {
+ s = p++;
+ n = fmt + 1;
+ if (*p == '-')
+ *n++ = *p++;
+ while (isdigit(*(uchar*)p) && n - fmt < (int)(sizeof fmt) - 8)
+ *n++ = *p++;
+ if (!*p)
+ break;
+ *n = '\0';
n = NULL;
- switch (p[1]) {
+ 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",
+ strlcat(fmt, ".0f", sizeof fmt);
+ snprintf(buf2, sizeof buf2, fmt,
(double)file->length);
n = buf2;
break;
case 'p':
- snprintf(buf2, sizeof buf2, "%d",
+ strlcat(fmt, "d", sizeof fmt);
+ snprintf(buf2, sizeof buf2, fmt,
(int)getpid());
n = buf2;
break;
case 'o': n = op; break;
case 'f':
- pathjoin(buf2, sizeof buf2,
- am_sender && file->dir.root ? file->dir.root : "",
- safe_fname(f_name(file)));
- clean_fname(buf2, 0);
- n = buf2;
- if (*n == '/') n++;
+ n = safe_fname(f_name(file));
+ 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. */
+ if (fmt[1])
+ strcpy(n, buf2);
+ else
+ n = buf2;
+ }
+ clean_fname(n, 0);
+ if (*n == '/')
+ n++;
break;
case 'n':
- n = (char*)safe_fname(f_name(file));
+ 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. */
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;
b = stats.total_read -
initial_stats->total_read;
}
- snprintf(buf2, sizeof buf2, "%.0f", (double)b);
+ 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;
b = stats.total_read -
initial_stats->total_read;
}
- snprintf(buf2, sizeof buf2, "%.0f", (double)b);
+ snprintf(buf2, sizeof buf2, fmt, (double)b);
n = buf2;
break;
case 'i':
if (iflags & ITEM_DELETED) {
- n = "deleting";
+ n = "*deleting";
break;
}
- n = buf2;
- n[0] = !(iflags & ITEM_UPDATING) ? '.'
- : *op == 's' ? '>' : '<';
+ n = buf2 + MAXPATHLEN - 32;
+ n[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[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p';
n[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o';
n[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g';
- n[8] = '.';
+ n[8] = !(iflags & ITEM_REPORT_XATTRS) ? '.' : 'a';
n[9] = '\0';
if (iflags & (ITEM_IS_NEW|ITEM_MISSING_DATA)) {
int i;
for (i = 2; n[i]; i++)
n[i] = ch;
- } else if (!(iflags & ITEM_UPDATING)) {
+ } else if (!(iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE))) {
int i;
for (i = 2; n[i]; i++) {
if (n[i] != '.')
if (!n[i]) {
for (i = 2; n[i]; i++)
n[i] = ' ';
- n[0] = '=';
}
}
break;
}
- /* n is the string to be inserted in place of this %
- * code; len is its length not including the trailing
- * NUL */
- if (!n) {
- p += 2;
+ /* "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);
- if (len + total - 2 >= sizeof buf) {
+ /* Subtract the length of the escape from the string's size. */
+ total -= p - s;
+
+ if (len + total >= sizeof buf) {
rprintf(FERROR,
"buffer overflow expanding %%%c -- exiting\n",
- p[0]);
+ p[-1]);
exit_cleanup(RERR_MESSAGEIO);
}
/* Shuffle the rest of the string along to make space for n */
- if (len != 2)
- memmove(p + len, p + 2, total - (p + 2 - buf) + 1);
- total += len - 2;
+ if (len != (size_t)(p - s))
+ memmove(s + len, p, total - (s - buf) + 1);
+ total += len;
- /* Insert the contents of string "n", but NOT its nul. */
+ /* Insert the contents of string "n", but NOT its null. */
if (len)
- memcpy(p, n, len);
+ memcpy(s, n, len);
/* Skip over inserted string; continue looking */
- p += len;
+ p = s + len;
}
rprintf(code, "%s\n", buf);
if (am_server) {
if (am_daemon && !dry_run && see_item)
log_item(file, &stats, iflags, buf);
- } else if (see_item || iflags & ITEM_UPDATING || *buf
- || (S_ISDIR(file->mode) && iflags & ITEM_REPORT_TIME))
+ } else if (see_item || iflags & ITEM_LOCAL_CHANGE || *buf
+ || (S_ISDIR(file->mode) && iflags & SIGNIFICANT_ITEM_FLAGS))
log_item(file, &stats, iflags, buf);
}
len++; /* directories include trailing null */
send_msg(MSG_DELETED, fname, len);
} else {
- fmt = log_format_has_o_or_i ? log_format : "%i %n";
+ fmt = log_format_has_o_or_i ? log_format : "deleting %n";
log_formatted(FCLIENT, fmt, "del.", &file, &stats,
ITEM_DELETED, NULL);
}
if (!am_daemon || dry_run || !lp_transfer_logging(module_id))
return;
- fmt = daemon_log_format_has_o_or_i ? lp_log_format(module_id) : "%i %n";
+ 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);
}
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff