improved error handling again. Now we report messages for the remote

[rsync/rsync.git] / log.c

diff --git a/log.c b/log.c
index a216b6a..e67477b 100644 (file)
--- a/log.c
+++ b/log.c
@@ -1,6 +1,6 @@
 /* -*- c-file-style: "linux"; -*-
    
-   Copyright (C) 1998-2001 by Andrew Tridgell <mbp@samba.org>
+   Copyright (C) 1998-2001 by Andrew Tridgell <tridge@samba.org>
    Copyright (C) 2000-2001 by Martin Pool <mbp@samba.org>
    
    This program is free software; you can redistribute it and/or modify
@@ -20,6 +20,7 @@
 
 /*
   Logging and utility functions.
+  tridge, May 1998
 
   Mapping to human-readable messages added by Martin Pool
   <mbp@samba.org>, Oct 2000.
@@ -30,6 +31,7 @@ static char *logfname;
 static FILE *logfile;
 static int log_error_fd = -1;
 
+int log_got_error=0;
 
 struct {
         int code;
@@ -38,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" }, 
@@ -47,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 }
 };
 
@@ -66,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)
 {
@@ -143,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
@@ -166,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;
        }
 
@@ -193,6 +258,7 @@ void rwrite(enum logcode code, char *buf, int len)
        }
 
        if (code == FERROR) {
+               log_got_error = 1;
                f = stderr;
        } 
 
@@ -445,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,"transfer error: %s (code %d) at %s(%d)\n", 
                        name, code, file, line);
        }
 }