Include 2008 in the copyright years.

[rsync/rsync.git] / log.c

diff --git a/log.c b/log.c
index acb2739..f480838 100644 (file)
--- a/log.c
+++ b/log.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 1998-2001 Andrew Tridgell <tridge@samba.org>
  * Copyright (C) 2000-2001 Martin Pool <mbp@samba.org>
- * Copyright (C) 2003-2007 Wayne Davison
+ * Copyright (C) 2003-2008 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,6 +20,7 @@
  */
 
 #include "rsync.h"
+#include "ifuncs.h"
 
 extern int verbose;
 extern int dry_run;
@@ -40,6 +41,7 @@ extern int stdout_format_has_i;
 extern int stdout_format_has_o_or_i;
 extern int logfile_format_has_i;
 extern int logfile_format_has_o_or_i;
+extern int receiver_symlink_times;
 extern mode_t orig_umask;
 extern char *auth_user;
 extern char *stdout_format;
@@ -60,7 +62,7 @@ static int logfile_was_closed;
 static FILE *logfile_fp;
 struct stats stats;
 
-int log_got_error = 0;
+int got_xfer_error = 0;
 
 struct {
         int code;
@@ -85,6 +87,7 @@ struct {
        { RERR_PARTIAL    , "some files could not be transferred" },
        { RERR_VANISHED   , "some files vanished before they could be transferred" },
        { RERR_TIMEOUT    , "timeout in data send/receive" },
+       { RERR_CONTIMEOUT , "timeout waiting for daemon connection" },
        { RERR_CMD_FAILED , "remote shell failed" },
        { RERR_CMD_KILLED , "remote shell killed" },
        { RERR_CMD_RUN    , "remote command could not be run" },
@@ -234,8 +237,8 @@ static void filtered_fwrite(FILE *f, const char *buf, int len, int use_isprint)
 }
 
 /* this is the underlying (unformatted) rsync debugging function. Call
- * it with FINFO, FERROR or FLOG.  Note: recursion can happen with
- * certain fatal conditions. */
+ * it with FINFO, FERROR_*, FWARNING, FLOG, or FCLIENT.  Note: recursion
+ * can happen with certain fatal conditions. */
 void rwrite(enum logcode code, const char *buf, int len, int is_utf8)
 {
        int trailing_CR_or_NL;
@@ -258,7 +261,7 @@ void rwrite(enum logcode code, const char *buf, int len, int is_utf8)
                return;
        }
 
-       if (code == FSOCKERR) /* This gets simplified for a non-sibling. */
+       if (code == FERROR_SOCKET) /* This gets simplified for a non-sibling. */
                code = FERROR;
 
        if (code == FCLIENT)
@@ -266,7 +269,7 @@ void rwrite(enum logcode code, const char *buf, int len, int is_utf8)
        else if (am_daemon || logfile_name) {
                static int in_block;
                char msg[2048];
-               int priority = code == FERROR ? LOG_WARNING : LOG_INFO;
+               int priority = code == FINFO || code == FLOG ? LOG_INFO :  LOG_WARNING;
 
                if (in_block)
                        return;
@@ -282,12 +285,19 @@ void rwrite(enum logcode code, const char *buf, int len, int is_utf8)
        } else if (code == FLOG)
                return;
 
-       if (quiet && code != FERROR)
+       if (quiet && code == FINFO)
                return;
 
        if (am_server) {
+               enum msgcode msg = (enum msgcode)code;
+               if (protocol_version < 30) {
+                       if (msg == MSG_ERROR)
+                               msg = MSG_ERROR_XFER;
+                       else if (msg == MSG_WARNING)
+                               msg = MSG_INFO;
+               }
                /* Pass the message to the non-server side. */
-               if (send_msg((enum msgcode)code, buf, len, !is_utf8))
+               if (send_msg(msg, buf, len, !is_utf8))
                        return;
                if (am_daemon) {
                        /* TODO: can we send the error to the user somehow? */
@@ -296,8 +306,11 @@ void rwrite(enum logcode code, const char *buf, int len, int is_utf8)
        }
 
        switch (code) {
+       case FERROR_XFER:
+               got_xfer_error = 1;
+               /* FALL THROUGH */
        case FERROR:
-               log_got_error = 1;
+       case FWARNING:
                f = stderr;
                break;
        case FINFO:
@@ -341,8 +354,8 @@ void rwrite(enum logcode code, const char *buf, int len, int is_utf8)
        }
 }
 
-/* This is the rsync debugging function. Call it with FINFO, FERROR or
- * FLOG. */
+/* This is the rsync debugging function. Call it with FINFO, FERROR_*,
+ * FWARNING, FLOG, or FCLIENT. */
 void rprintf(enum logcode code, const char *format, ...)
 {
        va_list ap;
@@ -420,10 +433,10 @@ void rflush(enum logcode code)
        if (am_daemon || code == FLOG)
                return;
 
-       if (code == FERROR || am_server)
-               f = stderr;
-       else
+       if (code == FINFO && !am_server)
                f = stdout;
+       else
+               f = stderr;
 
        fflush(f);
 }
@@ -611,7 +624,7 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
                        break;
                case 'i':
                        if (iflags & ITEM_DELETED) {
-                               n = "*deleting";
+                               n = "*deleting  ";
                                break;
                        }
                        n  = c = buf2 + MAXPATHLEN - 32;
@@ -626,7 +639,8 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
                        c[2] = !(iflags & ITEM_REPORT_CHECKSUM) ? '.' : 'c';
                        c[3] = !(iflags & ITEM_REPORT_SIZE) ? '.' : 's';
                        c[4] = !(iflags & ITEM_REPORT_TIME) ? '.'
-                            : !preserve_times || S_ISLNK(file->mode) ? 'T' : 't';
+                            : !preserve_times || (!receiver_symlink_times && S_ISLNK(file->mode))
+                            ? 'T' : 't';
                        c[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p';
                        c[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o';
                        c[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g';
@@ -800,7 +814,7 @@ void log_exit(int code, const char *file, int line)
 
                /* VANISHED is not an error, only a warning */
                if (code == RERR_VANISHED) {
-                       rprintf(FINFO, "rsync warning: %s (code %d) at %s(%d) [%s=%s]\n",
+                       rprintf(FWARNING, "rsync warning: %s (code %d) at %s(%d) [%s=%s]\n",
                                name, code, file, line, who_am_i(), RSYNC_VERSION);
                } else {
                        rprintf(FERROR, "rsync error: %s (code %d) at %s(%d) [%s=%s]\n",