extern int am_sender;
extern int quiet;
extern int module_id;
+extern int msg_fd_out;
extern char *auth_user;
extern char *log_format;
static int log_initialised;
static char *logfname;
static FILE *logfile;
-static int log_error_fd = -1;
struct stats stats;
-int log_got_error=0;
+int log_got_error = 0;
struct {
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 = new(struct err_list);
- if (!el) exit_cleanup(RERR_MALLOC);
- el->next = NULL;
- el->buf = new_array(char, 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)
{
}
}
-/* setup the error file descriptor - used when we are a server
- * that is receiving files */
-void set_error_fd(int fd)
-{
- log_error_fd = fd;
- set_nonblocking(log_error_fd);
-}
-
/* this is the underlying (unformatted) rsync debugging function. Call
* it with FINFO, FERROR or FLOG */
void rwrite(enum logcode code, char *buf, int len)
{
- FILE *f=NULL;
+ FILE *f = NULL;
/* recursion can happen with certain fatal conditions */
- if (quiet && code == FINFO) return;
+ if (quiet && code == FINFO)
+ return;
- if (len < 0) exit_cleanup(RERR_MESSAGEIO);
+ if (len < 0)
+ exit_cleanup(RERR_MESSAGEIO);
buf[len] = 0;
return;
}
- /* 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;
- }
-
- /* next, if we are a server and multiplexing is enabled,
- * pass it to the other side. */
- if (am_server && io_multiplex_write(code, buf, len)) {
- return;
+ if (am_server) {
+ /* Pass it to non-server side, perhaps through our sibling. */
+ if (msg_fd_out >= 0) {
+ send_msg((enum msgcode)code, buf, len);
+ return;
+ }
+ if (!am_daemon
+ && io_multiplex_write((enum msgcode)code, buf, len))
+ return;
}
/* otherwise, if in daemon mode and either we are not a server
void rprintf(enum logcode code, const char *format, ...)
{
va_list ap;
- char buf[1024];
- int len;
+ char buf[MAXPATHLEN+512];
+ size_t len;
va_start(ap, format);
- /* Note: might return -1 */
len = vsnprintf(buf, sizeof(buf), format, ap);
va_end(ap);
/* 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 ((size_t) len > sizeof(buf)-1 || len < 0) {
+ * truncate the resulting string. (Note that configure ensures
+ * that we have a vsnprintf() that doesn't ever return -1.) */
+ if (len > sizeof buf - 1) {
const char ellipsis[] = "[...]";
/* Reset length, and zero-terminate the end of our buffer */
void rsyserr(enum logcode code, int errcode, const char *format, ...)
{
va_list ap;
- char buf[1024];
- int len;
- size_t sys_len;
- char *sysmsg;
+ char buf[MAXPATHLEN+512];
+ size_t len;
+
+ strcpy(buf, RSYNC_NAME ": ");
+ len = (sizeof RSYNC_NAME ": ") - 1;
va_start(ap, format);
- /* Note: might return <0 */
- len = vsnprintf(buf, sizeof(buf), format, ap);
+ len += vsnprintf(buf + len, sizeof buf - len, format, ap);
va_end(ap);
- /* TODO: Put in RSYNC_NAME at the start. */
-
- if ((size_t) len > sizeof(buf)-1)
- exit_cleanup(RERR_MESSAGEIO);
-
- sysmsg = strerror(errcode);
- sys_len = strlen(sysmsg);
- if ((size_t) len + 3 + sys_len > sizeof(buf) - 1)
+ if (len < sizeof buf) {
+ len += snprintf(buf + len, sizeof buf - len,
+ ": %s (%d)\n", strerror(errcode), errcode);
+ }
+ if (len >= sizeof buf)
exit_cleanup(RERR_MESSAGEIO);
- strcpy(buf + len, ": ");
- len += 2;
- strcpy(buf + len, sysmsg);
- len += sys_len;
- strcpy(buf + len, "\n");
- len++;
-
rwrite(code, buf, len);
}
* rather keep going until we reach the nul of the format.
* Just to make sure we don't clobber that nul and therefore
* accidentally keep going, we zero the buffer now. */
- memset(buf, 0, sizeof buf);
- strlcpy(buf, format, sizeof(buf));
+ l = strlcpy(buf, format, sizeof buf);
+ if (l < sizeof buf)
+ memset(buf + l, 0, sizeof buf - l);
for (s = &buf[0]; s && (p = strchr(s,'%')); ) {
n = NULL;
break;
case 'o': n = op; break;
case 'f':
- snprintf(buf2, sizeof(buf2), "%s/%s",
- file->basedir?file->basedir:"",
+ pathjoin(buf2, sizeof buf2,
+ file->basedir ? file->basedir : "",
f_name(file));
clean_fname(buf2);
n = buf2;
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff