Note about proxy authentication and SOCKS.

[rsync.git] / log.c

diff --git a/log.c b/log.c
index a826b185bad829623afefead84428cd0fbaa9b0c..421829bd979826dda96e668961aa296c54e9471e 100644 (file)
--- a/log.c
+++ b/log.c
@@ -31,6 +31,7 @@ static char *logfname;
 static FILE *logfile;
 static int log_error_fd = -1;
 
+int log_got_error=0;
 
 struct {
         int code;
@@ -39,7 +40,7 @@ struct {
        { RERR_SYNTAX     , "syntax or usage error" }, 
        { RERR_PROTOCOL   , "protocol incompatibility" }, 
        { RERR_FILESELECT , "errors selecting input/output files, dirs" }, 
-       { RERR_UNSUPPORTED , "requested action not supported" }, 
+       { RERR_UNSUPPORTED, "requested action not supported" }, 
        { RERR_SOCKETIO   , "error in socket IO" }, 
        { RERR_FILEIO     , "error in file IO" }, 
        { RERR_STREAMIO   , "error in rsync protocol data stream" }, 
@@ -48,7 +49,12 @@ struct {
        { RERR_SIGNAL     , "received SIGUSR1 or SIGINT" }, 
        { RERR_WAITCHILD  , "some error returned by waitpid()" }, 
        { RERR_MALLOC     , "error allocating core memory buffers" }, 
+       { RERR_PARTIAL    , "partial transfer" }, 
        { 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" },
         { 0, NULL }
 };
 
@@ -107,6 +113,8 @@ void err_list_push(void)
        while (err_list_head) {
                struct err_list *el = err_list_head;
                int n = write(log_error_fd, el->buf+el->written, el->len - el->written);
+               /* don't check for an error if the best way of handling the error is
+                  to ignore it */
                if (n == -1) break;
                if (n > 0) {
                        el->written += n;
@@ -250,6 +258,7 @@ void rwrite(enum logcode code, char *buf, int len)
        }
 
        if (code == FERROR) {
+               log_got_error = 1;
                f = stderr;
        } 
 
@@ -277,10 +286,34 @@ void rprintf(enum logcode code, const char *format, ...)
        int len;
 
        va_start(ap, format);
-       len = vslprintf(buf, sizeof(buf), format, ap);
+       len = vsnprintf(buf, sizeof(buf), format, ap);
        va_end(ap);
 
-       if (len > sizeof(buf)-1) exit_cleanup(RERR_MESSAGEIO);
+       /* Deal with buffer overruns.  Instead of panicking, just
+        * truncate the resulting string.  Note that some vsnprintf()s
+        * return -1 on truncation, e.g., glibc 2.0.6 and earlier. */
+       if (len > sizeof(buf)-1  ||  len < 0) {
+               const char ellipsis[] = "[...]";
+
+               /* Reset length, and zero-terminate the end of our buffer */
+               len = sizeof(buf)-1;
+               buf[len] = '\0';
+
+               /* Copy the ellipsis to the end of the string, but give
+                * us one extra character:
+                *
+                *                  v--- null byte at buf[sizeof(buf)-1]
+                *        abcdefghij0
+                *     -> abcd[...]00  <-- now two null bytes at end
+                *
+                * If the input format string has a trailing newline,
+                * we copy it into that extra null; if it doesn't, well,
+                * all we lose is one byte.  */
+               strncpy(buf+len-sizeof(ellipsis), ellipsis, sizeof(ellipsis));
+               if (format[strlen(format)-1] == '\n') {
+                       buf[len-1] = '\n';
+               }
+       }
 
        rwrite(code, buf, len);
 }
@@ -302,7 +335,7 @@ void rsyserr(enum logcode code, int errcode, const char *format, ...)
         char *sysmsg;
 
        va_start(ap, format);
-       len = vslprintf(buf, sizeof(buf), format, ap);
+       len = vsnprintf(buf, sizeof(buf), format, ap);
        va_end(ap);
 
        if (len > sizeof(buf)-1) exit_cleanup(RERR_MESSAGEIO);
@@ -383,18 +416,18 @@ static void log_formatted(enum logcode code,
                case 'h': if (am_daemon) n = client_name(0); break;
                case 'a': if (am_daemon) n = client_addr(0); break;
                case 'l': 
-                       slprintf(buf2,sizeof(buf2),"%.0f", 
+                       snprintf(buf2,sizeof(buf2),"%.0f", 
                                 (double)file->length); 
                        n = buf2;
                        break;
                case 'p': 
-                       slprintf(buf2,sizeof(buf2),"%d", 
+                       snprintf(buf2,sizeof(buf2),"%d", 
                                 (int)getpid()); 
                        n = buf2;
                        break;
                case 'o': n = op; break;
                case 'f': 
-                       slprintf(buf2, sizeof(buf2), "%s/%s", 
+                       snprintf(buf2, sizeof(buf2), "%s/%s", 
                                 file->basedir?file->basedir:"", 
                                 f_name(file));
                        clean_fname(buf2);
@@ -413,7 +446,7 @@ static void log_formatted(enum logcode code,
                                b = stats.total_read - 
                                        initial_stats->total_read;
                        }
-                       slprintf(buf2,sizeof(buf2),"%.0f", (double)b); 
+                       snprintf(buf2,sizeof(buf2),"%.0f", (double)b); 
                        n = buf2;
                        break;
                case 'c': 
@@ -424,7 +457,7 @@ static void log_formatted(enum logcode code,
                                b = stats.total_read - 
                                        initial_stats->total_read;
                        }
-                       slprintf(buf2,sizeof(buf2),"%.0f", (double)b); 
+                       snprintf(buf2,sizeof(buf2),"%.0f", (double)b); 
                        n = buf2;
                        break;
                }
@@ -433,7 +466,7 @@ static void log_formatted(enum logcode code,
 
                l = strlen(n);
 
-               if ((l-1) + ((int)(s - &buf[0])) > sizeof(buf)) {
+               if (l + ((int)(s - &buf[0])) >= sizeof(buf)) {
                        rprintf(FERROR,"buffer overflow expanding %%%c - exiting\n",
                                p[0]);
                        exit_cleanup(RERR_MESSAGEIO);
@@ -502,7 +535,7 @@ void log_exit(int code, const char *file, int line)
                 if (!name)
                         name = "unexplained error";
                 
-               rprintf(FLOG,"transfer interrupted: %s (code %d) at %s(%d)\n", 
+               rprintf(FERROR,"rsync error: %s (code %d) at %s(%d)\n", 
                        name, code, file, line);
        }
 }