Decided that the '<' and '>' output in the %i format were

[rsync/rsync.git] / log.c

diff --git a/log.c b/log.c
index 35da9e1..b09b334 100644 (file)
--- a/log.c
+++ b/log.c
@@ -58,6 +58,7 @@ struct {
        { 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" },
@@ -71,8 +72,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  , "the --max-delete limit stopped deletions" },
        { 0, NULL }
 };
 
@@ -155,7 +157,7 @@ void log_open(void)
                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);
                }
        }
 }
@@ -433,14 +435,14 @@ static void log_formatted(enum logcode code, char *format, char *op,
                        break;
                case 'i':
                        if (iflags & ITEM_DELETED) {
-                               n = "deleting";
+                               n = "*deleting";
                                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' ? '>' : '<';
+                            : *op == 's' ? '<' : '>';
                        n[1] = S_ISDIR(file->mode) ? 'd'
                             : IS_DEVICE(file->mode) ? 'D'
                             : S_ISLNK(file->mode) ? 'L' : 'f';
@@ -469,8 +471,6 @@ static void log_formatted(enum logcode code, char *format, char *op,
                                if (!n[i]) {
                                        for (i = 2; n[i]; i++)
                                                n[i] = ' ';
-                                       if (n[0] == '.')
-                                               n[0] = '=';
                                }
                        }
                        break;
@@ -532,7 +532,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);
 }
 
@@ -552,7 +552,7 @@ void log_delete(char *fname, int mode)
                        len++; /* directories include trailing null */
                send_msg(MSG_DELETED, fname, len);
        } else {
-               fmt = log_format_has_o_or_i ? log_format : "%i %n";
+               fmt = log_format_has_o_or_i ? log_format : "deleting %n";
                log_formatted(FCLIENT, fmt, "del.", &file, &stats,
                              ITEM_DELETED, NULL);
        }
@@ -560,7 +560,7 @@ void log_delete(char *fname, int mode)
        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";
+       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);
 }