static FILE *logfile;
static int log_error_fd = -1;
+int log_got_error=0;
struct {
int code;
{ 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" },
{ 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 }
};
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)
{
void set_error_fd(int fd)
{
log_error_fd = fd;
+ set_nonblocking(log_error_fd);
}
/* this is the underlying (unformatted) rsync debugging function. Call
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;
}
}
if (code == FERROR) {
+ log_got_error = 1;
f = stderr;
}
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);
}
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);
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);
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':
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;
}
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);
}
}
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff