X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/ef74f5d626ef0220233e02fba1e3cc24a4902818..15954da08fb9280c754db3a4382c18f5ed0cf04b:/log.c diff --git a/log.c b/log.c index eb54cb55..905c64af 100644 --- a/log.c +++ b/log.c @@ -417,18 +417,19 @@ static void log_formatted(enum logcode code, break; case 'i': n = buf2; - n[0] = !(iflags & ITEM_UPDATING) ? ' ' : dry_run - ? '*' : *op == 's' ? '>' : '<'; + 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) ? '-' + 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[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)) {