The uid & gid are now stored using an id_pair structure.

[rsync/rsync.git] / log.c

diff --git a/log.c b/log.c
index 0b2b8e9..65952b5 100644 (file)
--- a/log.c
+++ b/log.c
@@ -265,10 +265,11 @@ void rwrite(enum logcode code, char *buf, int len)
        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--;
@@ -646,7 +647,7 @@ void maybe_log_item(struct file_struct *file, int iflags, int itemizing,
 {
        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)