Clean up from rsync+ patch; fix compiler warning.

[rsync/rsync.git] / log.c

diff --git a/log.c b/log.c
index aef3ac8..64e97b9 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 }
 };
 
@@ -67,6 +73,61 @@ static char const *rerr_name(int code)
         return NULL;
 }
 
+struct err_list {
+       struct err_list *next;
+       char *buf;
+       int len;
+       int written; /* how many bytes we have written so far */
+};
+
+static struct err_list *err_list_head;
+static struct err_list *err_list_tail;
+
+/* add an error message to the pending error list */
+static void err_list_add(int code, char *buf, int len)
+{
+       struct err_list *el;
+       el = (struct err_list *)malloc(sizeof(*el));
+       if (!el) exit_cleanup(RERR_MALLOC);
+       el->next = NULL;
+       el->buf = malloc(len+4);
+       if (!el->buf) exit_cleanup(RERR_MALLOC);
+       memcpy(el->buf+4, buf, len);
+       SIVAL(el->buf, 0, ((code+MPLEX_BASE)<<24) | len);
+       el->len = len+4;
+       el->written = 0;
+       if (err_list_tail) {
+               err_list_tail->next = el;
+       } else {
+               err_list_head = el;
+       }
+       err_list_tail = el;
+}
+
+
+/* try to push errors off the error list onto the wire */
+void err_list_push(void)
+{
+       if (log_error_fd == -1) return;
+
+       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;
+               }
+               if (el->written == el->len) {
+                       free(el->buf);
+                       err_list_head = el->next;
+                       if (!err_list_head) err_list_tail = NULL;
+                       free(el);
+               }
+       }
+}
+
 
 static void logit(int priority, char *buf)
 {
@@ -144,6 +205,7 @@ void log_close()
 void set_error_fd(int fd)
 {
        log_error_fd = fd;
+       set_nonblocking(log_error_fd);
 }
 
 /* this is the underlying (unformatted) rsync debugging function. Call
@@ -167,8 +229,10 @@ void rwrite(enum logcode code, char *buf, int len)
                return;
        }
 
-       /* first try to pass it off the our sibling */
-       if (am_server && io_error_write(log_error_fd, code, buf, len)) {
+       /* first try to pass it off to our sibling */
+       if (am_server && log_error_fd != -1) {
+               err_list_add(code, buf, len);
+               err_list_push();
                return;
        }
 
@@ -194,6 +258,7 @@ void rwrite(enum logcode code, char *buf, int len)
        }
 
        if (code == FERROR) {
+               log_got_error = 1;
                f = stderr;
        } 
 
@@ -221,7 +286,7 @@ 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);
@@ -246,7 +311,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);
@@ -327,18 +392,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);
@@ -357,7 +422,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': 
@@ -368,7 +433,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;
                }
@@ -446,7 +511,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);
        }
 }