case FERROR:
log_got_error = 1;
f = stderr;
- break;
+ goto pre_scan;
case FINFO:
f = am_server ? stderr : stdout;
- while (len && (*buf == '\n' || *buf == '\t')) {
+ pre_scan:
+ while (len > 1 && (*buf == '\n' || *buf == '\t')) {
fputc(*buf, f);
buf++;
len--;
: !(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 ? '+' : '?';
{
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)