{ 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);
}
}
}
/* 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)
+static void log_formatted(enum logcode code, char *format, char *op,
+ struct file_struct *file, struct stats *initial_stats,
+ int iflags, char *hlink)
{
char buf[MAXPATHLEN+1024];
char buf2[MAXPATHLEN];
}
break;
case 'L':
- if (S_ISLNK(file->mode) && file->u.link) {
+ 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;
break;
case 'i':
if (iflags & ITEM_DELETED) {
- n = "deleting";
+ n = "*deleting";
break;
}
n = buf2;
- n[0] = !(iflags & ITEM_UPDATING) ? '.'
- : *op == 's' ? '>' : '<';
+ n[0] = iflags & ITEM_LOCAL_CHANGE
+ ? iflags & ITEM_XNAME_FOLLOWS ? 'h' : 'c'
+ : !(iflags & ITEM_TRANSFER) ? '.'
+ : *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] = '\0';
+ n[8] = !(iflags & ITEM_REPORT_XATTRS) ? '.' : 'a';
+ n[9] = '\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_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;
rprintf(code, "%s\n", buf);
}
-/* log the outgoing transfer of a file */
-void log_send(struct file_struct *file, struct stats *initial_stats, int iflags)
+/* log the transfer of a file */
+void log_item(struct file_struct *file, struct stats *initial_stats,
+ int iflags, char *hlink)
{
+ char *s_or_r = am_sender ? "send" : "recv";
+
if (lp_transfer_logging(module_id)) {
- log_formatted(FLOG, lp_log_format(module_id), "send",
- file, initial_stats, iflags);
+ 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, "send",
- file, initial_stats, iflags);
+ log_formatted(FINFO, log_format, s_or_r,
+ file, initial_stats, iflags, hlink);
}
}
-/* log the incoming transfer of a file */
-void log_recv(struct file_struct *file, struct stats *initial_stats, int iflags)
+void maybe_log_item(struct file_struct *file, int iflags, int itemizing,
+ char *buf)
{
- if (lp_transfer_logging(module_id)) {
- 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, iflags);
- }
+ int see_item = itemizing && (iflags || verbose > 1);
+ 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);
}
-
void log_delete(char *fname, int mode)
{
static struct file_struct file;
len++; /* directories include trailing null */
send_msg(MSG_DELETED, fname, len);
} else {
- fmt = log_format_has_o_or_i ? log_format : "%i %n";
- log_formatted(FCLIENT, fmt, "del.", &file, &stats, ITEM_DELETED);
+ 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";
- log_formatted(FLOG, fmt, "del.", &file, &stats, ITEM_DELETED);
+ 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