extern struct stats stats;
static int buffer_f_in = -1;
+static int io_error_fd = -1;
+static int in_read_check;
void setup_readbuffer(int f_in)
{
}
}
+/* setup the fd used to propogate errors */
+void io_set_error_fd(int fd)
+{
+ io_error_fd = fd;
+}
+
+/* read some data from the error fd and write it to FERROR */
+static void read_error_fd(void)
+{
+ char buf[200];
+ int n;
+ int fd = io_error_fd;
+ io_error_fd = -1;
+
+ n = read(fd, buf, sizeof(buf)-1);
+ if (n > 0) {
+ rwrite(FERROR, buf, n);
+ }
+
+ io_error_fd = fd;
+}
+
static char *read_buffer;
static char *read_buffer_p;
while (ret == 0) {
fd_set fds;
struct timeval tv;
+ int fd_count = fd+1;
FD_ZERO(&fds);
FD_SET(fd, &fds);
+ if (io_error_fd != -1) {
+ FD_SET(io_error_fd, &fds);
+ if (io_error_fd > fd) fd_count = io_error_fd+1;
+ }
+
tv.tv_sec = io_timeout?io_timeout:SELECT_TIMEOUT;
tv.tv_usec = 0;
- if (select(fd+1, &fds, NULL, NULL, &tv) != 1) {
+ errno = 0;
+
+ if (select(fd_count, &fds, NULL, NULL, &tv) < 1) {
+ if (errno == EBADF) {
+ exit_cleanup(RERR_SOCKETIO);
+ }
check_timeout();
continue;
}
+ if (io_error_fd != -1 && FD_ISSET(io_error_fd, &fds)) {
+ read_error_fd();
+ }
+
+ if (!FD_ISSET(fd, &fds)) continue;
+
n = read(fd, buf, len);
if (n > 0) {
}
/* this prevents us trying to write errors on a dead socket */
- io_multiplexing_out = 0;
+ io_multiplexing_close();
rprintf(FERROR,"read error: %s\n", strerror(errno));
exit_cleanup(RERR_STREAMIO);
rprintf(tag,"%s", line);
remaining = 0;
+
+ if (in_read_check) break;
}
return ret;
static void read_check(int f)
{
int n = 8192;
+
+ in_read_check = 1;
if (f == -1) return;
n = read_unbuffered(f,read_buffer+read_buffer_len,n);
read_buffer_len += n;
+
+ in_read_check = 0;
}
FD_ZERO(&w_fds);
FD_ZERO(&r_fds);
FD_SET(fd,&w_fds);
- fd_count = fd+1;
+ fd_count = fd;
if (!no_flush_read) {
reading = (buffer_f_in != -1);
if (reading) {
FD_SET(buffer_f_in,&r_fds);
- if (buffer_f_in > fd)
- fd_count = buffer_f_in+1;
+ if (buffer_f_in > fd_count)
+ fd_count = buffer_f_in;
+ }
+
+ if (io_error_fd != -1) {
+ FD_SET(io_error_fd,&r_fds);
+ if (io_error_fd > fd_count)
+ fd_count = io_error_fd;
}
tv.tv_sec = io_timeout?io_timeout:SELECT_TIMEOUT;
tv.tv_usec = 0;
- count = select(fd_count,
- reading?&r_fds:NULL,
+ errno = 0;
+
+ count = select(fd_count+1,
+ (reading || io_error_fd != -1)?&r_fds:NULL,
&w_fds,NULL,
&tv);
if (count <= 0) {
+ if (errno == EBADF) {
+ exit_cleanup(RERR_SOCKETIO);
+ }
check_timeout();
continue;
}
read_check(buffer_f_in);
}
+ if (io_error_fd != -1 && FD_ISSET(io_error_fd, &r_fds)) {
+ read_error_fd();
+ }
+
if (FD_ISSET(fd, &w_fds)) {
int ret, n = len-total;
{
stats.total_written += len;
- if (!io_buffer) {
+ if (!io_buffer || fd != multiplex_out_fd) {
writefd_unbuffered(fd, buf, len);
return;
}
io_multiplexing_in = 1;
}
-/* write an message to the error stream */
+/* write an message to the multiplexed error stream */
int io_multiplex_write(int f, char *buf, int len)
{
if (!io_multiplexing_out) return 0;
return 1;
}
+/* write a message to the special error fd */
+int io_error_write(int f, char *buf, int len)
+{
+ if (f == -1) return 0;
+ writefd_unbuffered(f, buf, len);
+ return 1;
+}
+
+/* stop output multiplexing */
+void io_multiplexing_close(void)
+{
+ io_multiplexing_out = 0;
+}
+
void io_close_input(int fd)
{
buffer_f_in = -1;
#include "rsync.h"
static FILE *logfile;
-
+static int log_error_fd = -1;
static void logit(int priority, char *buf)
{
logit(LOG_INFO,"rsyncd started\n");
#endif
}
-
-/* this is the rsync debugging function. Call it with FINFO, FERROR or FLOG */
- void rprintf(int fd, const char *format, ...)
+/* 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;
+}
+
+/* this is the underlying (unformatted) rsync debugging function. Call
+ it with FINFO, FERROR or FLOG */
+void rwrite(int fd, char *buf, int len)
{
- va_list ap;
- char buf[1024];
- int len;
FILE *f=NULL;
extern int am_daemon;
extern int quiet;
if (quiet != 0 && fd == FINFO) return;
- va_start(ap, format);
- len = vslprintf(buf, sizeof(buf), format, ap);
- va_end(ap);
-
if (len < 0) exit_cleanup(RERR_MESSAGEIO);
- if (len > sizeof(buf)-1) exit_cleanup(RERR_MESSAGEIO);
-
buf[len] = 0;
if (fd == FLOG) {
depth++;
log_open();
- if (!io_multiplex_write(fd, buf, strlen(buf))) {
+
+ if (!io_error_write(log_error_fd, buf, strlen(buf)) &&
+ !io_multiplex_write(fd, buf, strlen(buf))) {
logit(priority, buf);
}
if (buf[len-1] == '\r' || buf[len-1] == '\n') fflush(f);
}
+
+
+/* this is the rsync debugging function. Call it with FINFO, FERROR or FLOG */
+ void rprintf(int fd, const char *format, ...)
+{
+ va_list ap;
+ char buf[1024];
+ int len;
+
+ va_start(ap, format);
+ len = vslprintf(buf, sizeof(buf), format, ap);
+ va_end(ap);
+
+ if (len > sizeof(buf)-1) exit_cleanup(RERR_MESSAGEIO);
+
+ rwrite(fd, buf, len);
+}
void rflush(int fd)
{
int pid;
int status=0;
int recv_pipe[2];
+ int error_pipe[2];
extern int preserve_hard_links;
if (preserve_hard_links)
rprintf(FERROR,"pipe failed in do_recv\n");
exit_cleanup(RERR_SOCKETIO);
}
+
+ if (pipe(error_pipe) < 0) {
+ rprintf(FERROR,"error pipe failed in do_recv\n");
+ exit_cleanup(RERR_SOCKETIO);
+ }
io_flush();
if ((pid=do_fork()) == 0) {
close(recv_pipe[0]);
+ close(error_pipe[0]);
if (f_in != f_out) close(f_out);
+ /* we can't let two processes write to the socket at one time */
+ io_multiplexing_close();
+
+ /* set place to send errors */
+ set_error_fd(error_pipe[1]);
+
recv_files(f_in,flist,local_name,recv_pipe[1]);
report(f_in);
}
close(recv_pipe[1]);
+ close(error_pipe[1]);
io_close_input(f_in);
if (f_in != f_out) close(f_in);
io_start_buffering(f_out);
+ io_set_error_fd(error_pipe[0]);
+
generate_files(f_out,flist,local_name,recv_pipe[0]);
io_flush();