Made itemize() output the fnamecmp_type and the fuzzy name based on

[rsync/rsync.git] / log.c

diff --git a/log.c b/log.c
index 35da9e1..855fb73 100644 (file)
--- a/log.c
+++ b/log.c
@@ -71,8 +71,9 @@ struct {
        { 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  , "--max-delete limit stopped deletions" },
        { 0, NULL }
 };
 
@@ -437,8 +438,8 @@ static void log_formatted(enum logcode code, char *format, char *op,
                                break;
                        }
                        n = buf2;
-                       n[0] = iflags & ITEM_HARD_LINKED ? 'h'
-                            : iflags & ITEM_LOCAL_CHANGE ? 'c'
+                       n[0] = iflags & ITEM_LOCAL_CHANGE
+                             ? iflags & ITEM_XNAME_FOLLOWS ? 'h' : 'c'
                             : !(iflags & ITEM_TRANSFER) ? '.'
                             : *op == 's' ? '>' : '<';
                        n[1] = S_ISDIR(file->mode) ? 'd'
@@ -532,7 +533,7 @@ void maybe_log_item(struct file_struct *file, int iflags, int itemizing,
                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 & ITEM_REPORT_TIME))
+           || (S_ISDIR(file->mode) && iflags & SIGNIFICANT_ITEM_FLAGS))
                log_item(file, &stats, iflags, buf);
 }