};
-
/*
* Map from rsync error code to name, or return NULL.
*/
return NULL;
}
-
static void logit(int priority, char *buf)
{
if (logfile_was_closed)
}
}
+static void filtered_fwrite(const char *buf, int len, FILE *f)
+{
+ const char *s, *end = buf + len;
+ for (s = buf; s < end; s++) {
+ if ((s < end - 4
+ && *s == '\\' && s[1] == '0'
+ && isdigit(*(uchar*)(s+2))
+ && isdigit(*(uchar*)(s+3))
+ && isdigit(*(uchar*)(s+4)))
+ || !isprint(*(uchar*)s)
+ || *(uchar*)s < ' ') {
+ if (s != buf && fwrite(buf, s - buf, 1, f) != 1)
+ exit_cleanup(RERR_MESSAGEIO);
+ fprintf(f, "\\%04o", *(uchar*)s);
+ buf = s + 1;
+ }
+ }
+ if (buf != end && fwrite(buf, end - buf, 1, f) != 1)
+ exit_cleanup(RERR_MESSAGEIO);
+}
+
/* this is the underlying (unformatted) rsync debugging function. Call
- * it with FINFO, FERROR or FLOG */
+ * it with FINFO, FERROR or FLOG. Note: recursion can happen with
+ * certain fatal conditions. */
void rwrite(enum logcode code, char *buf, int len)
{
+ int trailing_CR_or_NL;
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 (am_server && msg_fd_out >= 0) {
/* Pass the message to our sibling. */
send_msg((enum msgcode)code, buf, len);
}
}
- if (code == FERROR) {
+ switch (code) {
+ case FERROR:
log_got_error = 1;
f = stderr;
- }
-
- if (code == FINFO)
+ goto pre_scan;
+ case FINFO:
f = am_server ? stderr : stdout;
-
- if (!f)
+ pre_scan:
+ while (len > 1 && (*buf == '\n' || *buf == '\t')) {
+ fputc(*buf, f);
+ buf++;
+ len--;
+ }
+ break;
+ case FNAME:
+ f = am_server ? stderr : stdout;
+ break;
+ default:
exit_cleanup(RERR_MESSAGEIO);
+ }
- if (fwrite(buf, len, 1, f) != 1)
- exit_cleanup(RERR_MESSAGEIO);
+ trailing_CR_or_NL = len && (buf[len-1] == '\n' || buf[len-1] == '\r')
+ ? buf[--len] : 0;
- if (buf[len-1] == '\r' || buf[len-1] == '\n')
+ filtered_fwrite(buf, len, 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, ...)
rwrite(code, buf, len);
}
-
/* This is like rprintf, but it also tries to print some
* representation of the error code. Normally errcode = errno.
*
rwrite(code, buf, len);
}
-
-
void rflush(enum logcode code)
{
FILE *f = NULL;
fflush(f);
}
-
-
/* a generic logging routine for send/recv, with parameter
* substitiution */
static void log_formatted(enum logcode code, char *format, char *op,
n = op;
break;
case 'f':
- n = f_name(file);
+ n = f_name(file, NULL);
if (am_sender && file->dir.root) {
pathjoin(buf2, sizeof buf2,
file->dir.root, n);
n++;
break;
case 'n':
- n = f_name(file);
+ n = f_name(file, NULL);
if (S_ISDIR(file->mode))
strlcat(n, "/", MAXPATHLEN);
break;
: !(iflags & ITEM_TRANSFER) ? '.'
: !local_server && *op == 's' ? '<' : '>';
n[1] = S_ISDIR(file->mode) ? 'd'
+ : IS_SPECIAL(file->mode) ? 'S'
: 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';
+ : !preserve_times || 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';
+ n[8] = '\0';
if (iflags & (ITEM_IS_NEW|ITEM_MISSING_DATA)) {
char ch = iflags & ITEM_IS_NEW ? '+' : '?';
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,
+ log_formatted(FNAME, log_format, s_or_r,
file, initial_stats, iflags, hlink);
}
}
{
int significant_flags = iflags & SIGNIFICANT_ITEM_FLAGS;
int see_item = itemizing && (significant_flags || *buf
- || (verbose > 1 && log_format_has_i));
+ || log_format_has_i > 1 || (verbose > 1 && log_format_has_i));
int local_change = iflags & ITEM_LOCAL_CHANGE && significant_flags;
if (am_server) {
if (am_daemon && !dry_run && see_item)
log_formatted(FLOG, fmt, "del.", &file, &stats, ITEM_DELETED, NULL);
}
-
/*
* Called when the transfer is interrupted for some reason.
*