X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/8ef246e0b5a3aa9944dab4275353c50aab9f955c..6d56efa6ea66afa2e6f4eb79d9dd5f3b54b723c3:/io.c diff --git a/io.c b/io.c index 3ad91472..6e5c2329 100644 --- a/io.c +++ b/io.c @@ -4,11 +4,11 @@ * Copyright (C) 1996-2001 Andrew Tridgell * Copyright (C) 1996 Paul Mackerras * Copyright (C) 2001, 2002 Martin Pool - * Copyright (C) 2003, 2004, 2005, 2006 Wayne Davison + * Copyright (C) 2003-2008 Wayne Davison * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -17,8 +17,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. + * with this program; if not, visit the http://fsf.org website. */ /* Rsync provides its own multiplexing system, which is used to send @@ -29,6 +28,7 @@ * io_start_multiplex_out() and io_start_multiplex_in(). */ #include "rsync.h" +#include "ifuncs.h" /** If no timeout is specified then use a 60 second select timeout */ #define SELECT_TIMEOUT 60 @@ -41,24 +41,29 @@ extern int am_server; extern int am_daemon; extern int am_sender; extern int am_generator; -extern int incremental; +extern int inc_recurse; extern int io_error; extern int eol_nulls; extern int flist_eof; +extern int list_only; extern int read_batch; extern int csum_length; +extern int protect_args; extern int checksum_seed; extern int protocol_version; extern int remove_source_files; extern int preserve_hard_links; -extern char *filesfrom_host; extern struct stats stats; -extern struct file_list *cur_flist, *first_flist; +extern struct file_list *cur_flist; +#ifdef ICONV_OPTION +extern int filesfrom_convert; +extern iconv_t ic_send, ic_recv; +#endif const char phase_unknown[] = "unknown"; int ignore_timeout = 0; int batch_fd = -1; -int done_cnt = 0; +int msgdone_cnt = 0; /* Ignore an EOF error if non-zero. See whine_about_eof(). */ int kluge_around_eof = 0; @@ -91,27 +96,33 @@ static int write_batch_monitor_out = -1; static int io_filesfrom_f_in = -1; static int io_filesfrom_f_out = -1; -static char io_filesfrom_buf[2048]; -static char *io_filesfrom_bp; -static char io_filesfrom_lastchar; -static int io_filesfrom_buflen; -static int defer_forwarding_messages = 0; +static xbuf ff_buf = EMPTY_XBUF; +static char ff_lastchar; +#ifdef ICONV_OPTION +static xbuf iconv_buf = EMPTY_XBUF; +#endif +static int defer_forwarding_messages = 0, defer_forwarding_keep = 0; static int select_timeout = SELECT_TIMEOUT; static int active_filecnt = 0; static OFF_T active_bytecnt = 0; +static int first_message = 1; -static char int_byte_cnt[64] = { - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, /* (00 - 3F)/4 */ - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, /* (40 - 7F)/4 */ - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, /* (80 - BF)/4 */ - 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 7, 7, 8, 9, /* (C0 - FF)/4 */ +static char int_byte_extra[64] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* (00 - 3F)/4 */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* (40 - 7F)/4 */ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* (80 - BF)/4 */ + 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 5, 6, /* (C0 - FF)/4 */ }; -static int readfd_unbuffered(int fd, char *buf, size_t len); +#define REMOTE_OPTION_ERROR "rsync: on remote machine: -" +#define REMOTE_OPTION_ERROR2 ": unknown option" + +enum festatus { FES_SUCCESS, FES_REDO, FES_NO_SEND }; + +static void readfd(int fd, char *buffer, size_t N); static void writefd(int fd, const char *buf, size_t len); static void writefd_unbuffered(int fd, const char *buf, size_t len); -static void decrement_active_files(int ndx); -static void decrement_flist_in_progress(int ndx, int redo); +static void mplex_write(int fd, enum msgcode code, const char *buf, size_t len, int convert); struct flist_ndx_item { struct flist_ndx_item *next; @@ -126,7 +137,7 @@ static struct flist_ndx_list redo_list, hlink_list; struct msg_list_item { struct msg_list_item *next; - int len; + char convert; char buf[1]; }; @@ -134,7 +145,7 @@ struct msg_list { struct msg_list_item *head, *tail; }; -static struct msg_list msg2genr, msg2sndr; +static struct msg_list msg_queue; static void flist_ndx_push(struct flist_ndx_list *lp, int ndx) { @@ -169,6 +180,43 @@ static int flist_ndx_pop(struct flist_ndx_list *lp) return ndx; } +static void got_flist_entry_status(enum festatus status, const char *buf) +{ + int ndx = IVAL(buf, 0); + struct file_list *flist = flist_for_ndx(ndx); + + assert(flist != NULL); + + if (remove_source_files) { + active_filecnt--; + active_bytecnt -= F_LENGTH(flist->files[ndx - flist->ndx_start]); + } + + if (inc_recurse) + flist->in_progress--; + + switch (status) { + case FES_SUCCESS: + if (remove_source_files) + send_msg(MSG_SUCCESS, buf, 4, 0); + if (preserve_hard_links) { + struct file_struct *file = flist->files[ndx - flist->ndx_start]; + if (F_IS_HLINKED(file)) { + flist_ndx_push(&hlink_list, ndx); + flist->in_progress++; + } + } + break; + case FES_REDO: + if (inc_recurse) + flist->to_redo++; + flist_ndx_push(&redo_list, ndx); + break; + case FES_NO_SEND: + break; + } +} + static void check_timeout(void) { time_t t; @@ -230,7 +278,7 @@ void set_msg_fd_out(int fd) } /* Add a message to the pending MSG_* list. */ -static void msg_list_add(struct msg_list *lst, int code, const char *buf, int len) +static void msg_list_add(struct msg_list *lst, int code, const char *buf, int len, int convert) { struct msg_list_item *m; int sz = len + 4 + sizeof m[0] - 1; @@ -238,7 +286,7 @@ static void msg_list_add(struct msg_list *lst, int code, const char *buf, int le if (!(m = (struct msg_list_item *)new_array(char, sz))) out_of_memory("msg_list_add"); m->next = NULL; - m->len = len + 4; + m->convert = convert; SIVAL(m->buf, 0, ((code+MPLEX_BASE)<<24) | len); memcpy(m->buf + 4, buf, len); if (lst->tail) @@ -248,6 +296,66 @@ static void msg_list_add(struct msg_list *lst, int code, const char *buf, int le lst->tail = m; } +static void msg_flush(void) +{ + if (am_generator) { + while (msg_queue.head && io_multiplexing_out) { + struct msg_list_item *m = msg_queue.head; + int len = IVAL(m->buf, 0) & 0xFFFFFF; + int tag = *((uchar*)m->buf+3) - MPLEX_BASE; + if (!(msg_queue.head = m->next)) + msg_queue.tail = NULL; + stats.total_written += len + 4; + defer_forwarding_messages++; + mplex_write(sock_f_out, tag, m->buf + 4, len, m->convert); + defer_forwarding_messages--; + free(m); + } + } else { + while (msg_queue.head) { + struct msg_list_item *m = msg_queue.head; + int len = IVAL(m->buf, 0) & 0xFFFFFF; + int tag = *((uchar*)m->buf+3) - MPLEX_BASE; + if (!(msg_queue.head = m->next)) + msg_queue.tail = NULL; + defer_forwarding_messages++; + mplex_write(msg_fd_out, tag, m->buf + 4, len, m->convert); + defer_forwarding_messages--; + free(m); + } + } +} + +static void check_for_d_option_error(const char *msg) +{ + static char rsync263_opts[] = "BCDHIKLPRSTWabceghlnopqrtuvxz"; + char *colon; + int saw_d = 0; + + if (*msg != 'r' + || strncmp(msg, REMOTE_OPTION_ERROR, sizeof REMOTE_OPTION_ERROR - 1) != 0) + return; + + msg += sizeof REMOTE_OPTION_ERROR - 1; + if (*msg == '-' || (colon = strchr(msg, ':')) == NULL + || strncmp(colon, REMOTE_OPTION_ERROR2, sizeof REMOTE_OPTION_ERROR2 - 1) != 0) + return; + + for ( ; *msg != ':'; msg++) { + if (*msg == 'd') + saw_d = 1; + else if (*msg == 'e') + break; + else if (strchr(rsync263_opts, *msg) == NULL) + return; + } + + if (saw_d) { + rprintf(FWARNING, + "*** Try using \"--old-d\" if remote rsync is <= 2.6.3 ***\n"); + } +} + /* Read a message from the MSG_* fd and handle it. This is called either * during the early stages of being a local sender (up through the sending * of the file list) or when we're the generator (to fetch the messages @@ -262,9 +370,11 @@ static void read_msg_fd(void) /* Temporarily disable msg_fd_in. This is needed to avoid looping back * to this routine from writefd_unbuffered(). */ + no_flush++; msg_fd_in = -1; + defer_forwarding_messages++; - readfd_unbuffered(fd, buf, 4); + readfd(fd, buf, 4); tag = IVAL(buf, 0); len = tag & 0xFFFFFF; @@ -272,82 +382,90 @@ static void read_msg_fd(void) switch (tag) { case MSG_DONE: - if (len != 0 || !am_generator) { + if (len < 0 || len > 1 || !am_generator) { invalid_msg: rprintf(FERROR, "invalid message %d:%d [%s%s]\n", tag, len, who_am_i(), - incremental ? "/incremental" : ""); + inc_recurse ? "/inc" : ""); exit_cleanup(RERR_STREAMIO); } - done_cnt++; + if (len) { + readfd(fd, buf, len); + stats.total_read = read_varlong(fd, 3); + } + msgdone_cnt++; break; case MSG_REDO: if (len != 4 || !am_generator) goto invalid_msg; - readfd_unbuffered(fd, buf, 4); - if (remove_source_files) - decrement_active_files(IVAL(buf,0)); - flist_ndx_push(&redo_list, IVAL(buf,0)); - if (incremental) - decrement_flist_in_progress(IVAL(buf,0), 1); + readfd(fd, buf, 4); + got_flist_entry_status(FES_REDO, buf); break; case MSG_FLIST: - if (len != 4 || !am_generator || !incremental) + if (len != 4 || !am_generator || !inc_recurse) goto invalid_msg; - readfd_unbuffered(fd, buf, 4); + readfd(fd, buf, 4); /* Read extra file list from receiver. */ assert(iobuf_in != NULL); assert(iobuf_f_in == fd); + if (DEBUG_GTE(FLIST, 2)) { + rprintf(FINFO, "[%s] receiving flist for dir %d\n", + who_am_i(), IVAL(buf,0)); + } flist = recv_file_list(fd); flist->parent_ndx = IVAL(buf,0); +#ifdef SUPPORT_HARD_LINKS + if (preserve_hard_links) + match_hard_links(flist); +#endif break; case MSG_FLIST_EOF: - if (len != 0 || !am_generator || !incremental) + if (len != 0 || !am_generator || !inc_recurse) goto invalid_msg; flist_eof = 1; break; + case MSG_IO_ERROR: + if (len != 4) + goto invalid_msg; + readfd(fd, buf, len); + io_error |= IVAL(buf, 0); + break; case MSG_DELETED: if (len >= (int)sizeof buf || !am_generator) goto invalid_msg; - readfd_unbuffered(fd, buf, len); - send_msg(MSG_DELETED, buf, len); + readfd(fd, buf, len); + send_msg(MSG_DELETED, buf, len, 1); break; case MSG_SUCCESS: if (len != 4 || !am_generator) goto invalid_msg; - readfd_unbuffered(fd, buf, len); - if (remove_source_files) { - decrement_active_files(IVAL(buf,0)); - send_msg(MSG_SUCCESS, buf, len); - } - if (preserve_hard_links) - flist_ndx_push(&hlink_list, IVAL(buf,0)); - if (incremental) - decrement_flist_in_progress(IVAL(buf,0), 0); + readfd(fd, buf, 4); + got_flist_entry_status(FES_SUCCESS, buf); break; case MSG_NO_SEND: if (len != 4 || !am_generator) goto invalid_msg; - readfd_unbuffered(fd, buf, len); - if (incremental) - decrement_flist_in_progress(IVAL(buf,0), 0); + readfd(fd, buf, 4); + got_flist_entry_status(FES_NO_SEND, buf); break; - case MSG_SOCKERR: + case MSG_ERROR_SOCKET: case MSG_CLIENT: if (!am_generator) goto invalid_msg; - if (tag == MSG_SOCKERR) + if (tag == MSG_ERROR_SOCKET) io_end_multiplex_out(); /* FALL THROUGH */ case MSG_INFO: case MSG_ERROR: + case MSG_ERROR_XFER: + case MSG_WARNING: case MSG_LOG: while (len) { n = len; if (n >= sizeof buf) n = sizeof buf - 1; - readfd_unbuffered(fd, buf, n); - rwrite((enum logcode)tag, buf, n); + readfd(fd, buf, n); + rwrite((enum logcode)tag, buf, n, !am_generator); len -= n; } break; @@ -357,7 +475,10 @@ static void read_msg_fd(void) exit_cleanup(RERR_STREAMIO); } + no_flush--; msg_fd_in = fd; + if (!--defer_forwarding_messages && !no_flush) + msg_flush(); } /* This is used by the generator to limit how many file transfers can @@ -367,88 +488,74 @@ void increment_active_files(int ndx, int itemizing, enum logcode code) { /* TODO: tune these limits? */ while (active_filecnt >= (active_bytecnt >= 128*1024 ? 10 : 50)) { -#ifdef SUPPORT_HARD_LINKS - if (hlink_list.head) - check_for_finished_hlinks(itemizing, code); -#endif - read_msg_fd(); + check_for_finished_files(itemizing, code, 0); + if (iobuf_out_cnt) + io_flush(NORMAL_FLUSH); + else + read_msg_fd(); } active_filecnt++; - active_bytecnt += F_LENGTH(cur_flist->files[ndx]); + active_bytecnt += F_LENGTH(cur_flist->files[ndx - cur_flist->ndx_start]); } -static void decrement_active_files(int ndx) +/* Write an message to a multiplexed stream. If this fails, rsync exits. */ +static void mplex_write(int fd, enum msgcode code, const char *buf, size_t len, int convert) { - struct file_list *flist = flist_for_ndx(ndx); - assert(flist != NULL); - active_filecnt--; - active_bytecnt -= F_LENGTH(flist->files[ndx - flist->ndx_start]); -} + char buffer[BIGPATHBUFLEN]; /* Oversized for use by iconv code. */ + size_t n = len; -static void decrement_flist_in_progress(int ndx, int redo) -{ - struct file_list *flist = cur_flist ? cur_flist : first_flist; +#ifdef ICONV_OPTION + /* We need to convert buf before doing anything else so that we + * can include the (converted) byte length in the message header. */ + if (convert && ic_send != (iconv_t)-1) { + xbuf outbuf, inbuf; - while (ndx < flist->ndx_start) { - if (flist == first_flist) { - invalid_ndx: - rprintf(FERROR, - "Invalid file index: %d (%d - %d) [%s]\n", - ndx, first_flist->ndx_start, - first_flist->prev->ndx_start + first_flist->prev->count - 1, - who_am_i()); - exit_cleanup(RERR_PROTOCOL); + INIT_XBUF(outbuf, buffer + 4, 0, sizeof buffer - 4); + INIT_XBUF(inbuf, (char*)buf, len, -1); + + iconvbufs(ic_send, &inbuf, &outbuf, + ICB_INCLUDE_BAD | ICB_INCLUDE_INCOMPLETE); + if (inbuf.len > 0) { + rprintf(FERROR, "overflowed conversion buffer in mplex_write"); + exit_cleanup(RERR_UNSUPPORTED); } - flist = flist->prev; - } - while (ndx >= flist->ndx_start + flist->count) { - if (!(flist = flist->next)) - goto invalid_ndx; - } - flist->in_progress--; - if (redo) - flist->to_redo++; -} + n = len = outbuf.len; + } else +#endif + if (n > 1024 - 4) /* BIGPATHBUFLEN can handle 1024 bytes */ + n = 0; /* We'd rather do 2 writes than too much memcpy(). */ + else + memcpy(buffer + 4, buf, n); -/* Try to push messages off the list onto the wire. If we leave with more - * to do, return 0. On error, return -1. If everything flushed, return 1. - * This is only active in the receiver. */ -static int msg2genr_flush(void) -{ - if (msg_fd_out < 0 || no_flush) - return -1; + SIVAL(buffer, 0, ((MPLEX_BASE + (int)code)<<24) + len); - no_flush++; - while (msg2genr.head) { - struct msg_list_item *m = msg2genr.head; - writefd(msg_fd_out, m->buf, m->len); - msg2genr.head = m->next; - if (!msg2genr.head) - msg2genr.tail = NULL; - free(m); - } - if (iobuf_out_cnt) { - writefd_unbuffered(iobuf_f_out, iobuf_out, iobuf_out_cnt); - iobuf_out_cnt = 0; - } - no_flush--; - return 1; + defer_forwarding_keep = 1; /* defer_forwarding_messages++ on return */ + writefd_unbuffered(fd, buffer, n+4); + defer_forwarding_keep = 0; + + if (len > n) + writefd_unbuffered(fd, buf+n, len-n); + + if (!--defer_forwarding_messages && !no_flush) + msg_flush(); } -int send_msg(enum msgcode code, const char *buf, int len) +int send_msg(enum msgcode code, const char *buf, int len, int convert) { if (msg_fd_out < 0) { if (!defer_forwarding_messages) - return io_multiplex_write(code, buf, len); + return io_multiplex_write(code, buf, len, convert); if (!io_multiplexing_out) return 0; - msg_list_add(&msg2sndr, code, buf, len); + msg_list_add(&msg_queue, code, buf, len, convert); return 1; } - msg_list_add(&msg2genr, code, buf, len); - msg2genr_flush(); + if (flist_forward_from >= 0) + msg_list_add(&msg_queue, code, buf, len, convert); + else + mplex_write(msg_fd_out, code, buf, len, convert); return 1; } @@ -456,12 +563,15 @@ void send_msg_int(enum msgcode code, int num) { char numbuf[4]; SIVAL(numbuf, 0, num); - send_msg(code, numbuf, 4); + send_msg(code, numbuf, 4, 0); } void wait_for_receiver(void) { - read_msg_fd(); + if (iobuf_out_cnt) + io_flush(NORMAL_FLUSH); + else + read_msg_fd(); } int get_redo_num(void) @@ -480,17 +590,19 @@ int get_hlink_num(void) * things at the same time: send the sender a list of what files we're * processing and read the incoming file+info list from the sender. We do * this by augmenting the read_timeout() function to copy this data. It - * uses the io_filesfrom_buf to read a block of data from f_in (when it is - * ready, since it might be a pipe) and then blast it out f_out (when it - * is ready to receive more data). + * uses ff_buf to read a block of data from f_in (when it is ready, since + * it might be a pipe) and then blast it out f_out (when it is ready to + * receive more data). */ void io_set_filesfrom_fds(int f_in, int f_out) { io_filesfrom_f_in = f_in; io_filesfrom_f_out = f_out; - io_filesfrom_bp = io_filesfrom_buf; - io_filesfrom_lastchar = '\0'; - io_filesfrom_buflen = 0; + alloc_xbuf(&ff_buf, 2048); +#ifdef ICONV_OPTION + if (protect_args) + alloc_xbuf(&iconv_buf, 1024); +#endif } /* It's almost always an error to get an EOF when we're trying to read from the @@ -517,8 +629,8 @@ static void whine_about_eof(int fd) } rprintf(FERROR, RSYNC_NAME ": connection unexpectedly closed " - "(%.0f bytes received so far) [%s]\n", - (double)stats.total_read, who_am_i()); + "(%s bytes received so far) [%s]\n", + big_num(stats.total_read, 0), who_am_i()); exit_cleanup(RERR_STREAMIO); } @@ -538,7 +650,7 @@ static int read_timeout(int fd, char *buf, size_t len) { int n, cnt = 0; - io_flush(NORMAL_FLUSH); + io_flush(FULL_FLUSH); while (cnt == 0) { /* until we manage to read *something* */ @@ -550,14 +662,9 @@ static int read_timeout(int fd, char *buf, size_t len) FD_ZERO(&r_fds); FD_ZERO(&w_fds); FD_SET(fd, &r_fds); - if (msg2genr.head) { - FD_SET(msg_fd_out, &w_fds); - if (msg_fd_out > maxfd) - maxfd = msg_fd_out; - } if (io_filesfrom_f_out >= 0) { int new_fd; - if (io_filesfrom_buflen == 0) { + if (ff_buf.len == 0) { if (io_filesfrom_f_in >= 0) { FD_SET(io_filesfrom_f_in, &r_fds); new_fd = io_filesfrom_f_in; @@ -581,61 +688,74 @@ static int read_timeout(int fd, char *buf, size_t len) count = select(maxfd + 1, &r_fds, &w_fds, NULL, &tv); if (count <= 0) { - if (errno == EBADF) + if (errno == EBADF) { + defer_forwarding_messages = 0; exit_cleanup(RERR_SOCKETIO); + } check_timeout(); continue; } - if (msg2genr.head && FD_ISSET(msg_fd_out, &w_fds)) - msg2genr_flush(); - if (io_filesfrom_f_out >= 0) { - if (io_filesfrom_buflen) { + if (ff_buf.len) { if (FD_ISSET(io_filesfrom_f_out, &w_fds)) { int l = write(io_filesfrom_f_out, - io_filesfrom_bp, - io_filesfrom_buflen); + ff_buf.buf + ff_buf.pos, + ff_buf.len); if (l > 0) { - if (!(io_filesfrom_buflen -= l)) - io_filesfrom_bp = io_filesfrom_buf; + if (!(ff_buf.len -= l)) + ff_buf.pos = 0; else - io_filesfrom_bp += l; - } else { + ff_buf.pos += l; + } else if (errno != EINTR) { /* XXX should we complain? */ io_filesfrom_f_out = -1; } } } else if (io_filesfrom_f_in >= 0) { if (FD_ISSET(io_filesfrom_f_in, &r_fds)) { - int l = read(io_filesfrom_f_in, - io_filesfrom_buf, - sizeof io_filesfrom_buf); +#ifdef ICONV_OPTION + xbuf *ibuf = filesfrom_convert ? &iconv_buf : &ff_buf; +#else + xbuf *ibuf = &ff_buf; +#endif + int l = read(io_filesfrom_f_in, ibuf->buf, ibuf->size); if (l <= 0) { - /* Send end-of-file marker */ - io_filesfrom_buf[0] = '\0'; - io_filesfrom_buf[1] = '\0'; - io_filesfrom_buflen = io_filesfrom_lastchar? 2 : 1; - io_filesfrom_f_in = -1; + if (l == 0 || errno != EINTR) { + /* Send end-of-file marker */ + memcpy(ff_buf.buf, "\0\0", 2); + ff_buf.len = ff_lastchar? 2 : 1; + ff_buf.pos = 0; + io_filesfrom_f_in = -1; + } } else { +#ifdef ICONV_OPTION + if (filesfrom_convert) { + iconv_buf.pos = 0; + iconv_buf.len = l; + iconvbufs(ic_send, &iconv_buf, &ff_buf, + ICB_EXPAND_OUT|ICB_INCLUDE_BAD|ICB_INCLUDE_INCOMPLETE); + l = ff_buf.len; + } +#endif if (!eol_nulls) { - char *s = io_filesfrom_buf + l; + char *s = ff_buf.buf + l; /* Transform CR and/or LF into '\0' */ - while (s-- > io_filesfrom_buf) { + while (s-- > ff_buf.buf) { if (*s == '\n' || *s == '\r') *s = '\0'; } } - if (!io_filesfrom_lastchar) { + if (!ff_lastchar) { /* Last buf ended with a '\0', so don't * let this buf start with one. */ - while (l && !*io_filesfrom_bp) - io_filesfrom_bp++, l--; + while (l && ff_buf.buf[ff_buf.pos] == '\0') + ff_buf.pos++, l--; } if (!l) - io_filesfrom_bp = io_filesfrom_buf; + ff_buf.pos = 0; else { - char *f = io_filesfrom_bp; + char *f = ff_buf.buf + ff_buf.pos; char *t = f; char *eob = f + l; /* Eliminate any multi-'\0' runs. */ @@ -645,9 +765,9 @@ static int read_timeout(int fd, char *buf, size_t len) f++, l--; } } - io_filesfrom_lastchar = f[-1]; + ff_lastchar = f[-1]; } - io_filesfrom_buflen = l; + ff_buf.len = l; } } } @@ -668,7 +788,7 @@ static int read_timeout(int fd, char *buf, size_t len) /* Don't write errors on a dead socket. */ if (fd == sock_f_in) { io_end_multiplex_out(); - rsyserr(FSOCKERR, errno, "read error"); + rsyserr(FERROR_SOCKET, errno, "read error"); } else rsyserr(FERROR, errno, "read error"); exit_cleanup(RERR_STREAMIO); @@ -685,19 +805,24 @@ static int read_timeout(int fd, char *buf, size_t len) return cnt; } -/** - * Read a line into the "fname" buffer (which must be at least MAXPATHLEN - * characters long). - */ -int read_filesfrom_line(int fd, char *fname) +/* Read a line into the "buf" buffer. */ +int read_line(int fd, char *buf, size_t bufsiz, int flags) { - char ch, *s, *eob = fname + MAXPATHLEN - 1; + char ch, *s, *eob; int cnt; - int reading_remotely = filesfrom_host != NULL; - int nulls = eol_nulls || reading_remotely; + +#ifdef ICONV_OPTION + if (flags & RL_CONVERT && iconv_buf.size < bufsiz) + realloc_xbuf(&iconv_buf, bufsiz + 1024); +#endif start: - s = fname; +#ifdef ICONV_OPTION + s = flags & RL_CONVERT ? iconv_buf.buf : buf; +#else + s = buf; +#endif + eob = s + bufsiz - 1; while (1) { cnt = read(fd, &ch, 1); if (cnt < 0 && (errno == EWOULDBLOCK @@ -712,17 +837,15 @@ int read_filesfrom_line(int fd, char *fname) tv.tv_usec = 0; if (!select(fd+1, &r_fds, NULL, &e_fds, &tv)) check_timeout(); - if (FD_ISSET(fd, &e_fds)) { - rsyserr(FINFO, errno, - "select exception on fd %d", fd); - } + /*if (FD_ISSET(fd, &e_fds)) + rprintf(FINFO, "select exception on fd %d\n", fd); */ continue; } if (cnt != 1) break; - if (nulls? !ch : (ch == '\r' || ch == '\n')) { - /* Skip empty lines if reading locally. */ - if (!reading_remotely && s == fname) + if (flags & RL_EOL_NULLS ? ch == '\0' : (ch == '\r' || ch == '\n')) { + /* Skip empty lines if dumping comments. */ + if (flags & RL_DUMP_COMMENTS && s == buf) continue; break; } @@ -731,11 +854,76 @@ int read_filesfrom_line(int fd, char *fname) } *s = '\0'; - /* Dump comments. */ - if (*fname == '#' || *fname == ';') + if (flags & RL_DUMP_COMMENTS && (*buf == '#' || *buf == ';')) goto start; - return s - fname; +#ifdef ICONV_OPTION + if (flags & RL_CONVERT) { + xbuf outbuf; + INIT_XBUF(outbuf, buf, 0, bufsiz); + iconv_buf.pos = 0; + iconv_buf.len = s - iconv_buf.buf; + iconvbufs(ic_recv, &iconv_buf, &outbuf, + ICB_INCLUDE_BAD | ICB_INCLUDE_INCOMPLETE); + outbuf.buf[outbuf.len] = '\0'; + return outbuf.len; + } +#endif + + return s - buf; +} + +void read_args(int f_in, char *mod_name, char *buf, size_t bufsiz, int rl_nulls, + char ***argv_p, int *argc_p, char **request_p) +{ + int maxargs = MAX_ARGS; + int dot_pos = 0; + int argc = 0; + char **argv, *p; + int rl_flags = (rl_nulls ? RL_EOL_NULLS : 0); + +#ifdef ICONV_OPTION + rl_flags |= (protect_args && ic_recv != (iconv_t)-1 ? RL_CONVERT : 0); +#endif + + if (!(argv = new_array(char *, maxargs))) + out_of_memory("read_args"); + if (mod_name && !protect_args) + argv[argc++] = "rsyncd"; + + while (1) { + if (read_line(f_in, buf, bufsiz, rl_flags) == 0) + break; + + if (argc == maxargs-1) { + maxargs += MAX_ARGS; + if (!(argv = realloc_array(argv, char *, maxargs))) + out_of_memory("read_args"); + } + + if (dot_pos) { + if (request_p) { + *request_p = strdup(buf); + request_p = NULL; + } + if (mod_name) + glob_expand_module(mod_name, buf, &argv, &argc, &maxargs); + else + glob_expand(buf, &argv, &argc, &maxargs); + } else { + if (!(p = strdup(buf))) + out_of_memory("read_args"); + argv[argc++] = p; + if (*p == '.' && p[1] == '\0') + dot_pos = argc; + } + } + argv[argc] = NULL; + + glob_expand(NULL, NULL, NULL, NULL); + + *argc_p = argc; + *argv_p = argv; } int io_start_buffering_out(int f_out) @@ -785,9 +973,10 @@ void io_end_buffering_out(void) iobuf_f_out = -1; } -void maybe_flush_socket(void) +void maybe_flush_socket(int important) { - if (iobuf_out && iobuf_out_cnt && time(NULL) - last_io_out >= 5) + if (iobuf_out && iobuf_out_cnt + && (important || time(NULL) - last_io_out >= 5)) io_flush(NORMAL_FLUSH); } @@ -798,9 +987,9 @@ void maybe_send_keepalive(void) if (protocol_version < 29) return; /* there's nothing we can do */ if (protocol_version >= 30) - send_msg(MSG_NOOP, "", 0); + send_msg(MSG_NOOP, "", 0, 0); else { - write_int(sock_f_out, cur_flist->count); + write_int(sock_f_out, cur_flist->used); write_shortint(sock_f_out, ITEM_IS_NEW); } } @@ -818,8 +1007,8 @@ void start_flist_forward(int f_in) void stop_flist_forward() { - io_flush(NORMAL_FLUSH); flist_forward_from = -1; + io_flush(FULL_FLUSH); } /** @@ -892,12 +1081,43 @@ static int readfd_unbuffered(int fd, char *buf, size_t len) if (msg_bytes != 4) goto invalid_msg; read_loop(fd, line, msg_bytes); + send_msg_int(MSG_IO_ERROR, IVAL(line, 0)); io_error |= IVAL(line, 0); break; case MSG_DELETED: if (msg_bytes >= sizeof line) goto overflow; - read_loop(fd, line, msg_bytes); +#ifdef ICONV_OPTION + if (ic_recv != (iconv_t)-1) { + xbuf outbuf, inbuf; + char ibuf[512]; + int add_null = 0; + int pos = 0; + + INIT_CONST_XBUF(outbuf, line); + INIT_XBUF(inbuf, ibuf, 0, -1); + + while (msg_bytes) { + inbuf.len = msg_bytes > sizeof ibuf + ? sizeof ibuf : msg_bytes; + read_loop(fd, inbuf.buf, inbuf.len); + if (!(msg_bytes -= inbuf.len) + && !ibuf[inbuf.len-1]) + inbuf.len--, add_null = 1; + if (iconvbufs(ic_send, &inbuf, &outbuf, + ICB_INCLUDE_BAD | ICB_INCLUDE_INCOMPLETE) < 0) + goto overflow; + pos = -1; + } + if (add_null) { + if (outbuf.len == outbuf.size) + goto overflow; + outbuf.buf[outbuf.len++] = '\0'; + } + msg_bytes = outbuf.len; + } else +#endif + read_loop(fd, line, msg_bytes); /* A directory name was sent with the trailing null */ if (msg_bytes > 0 && !line[msg_bytes-1]) log_delete(line, S_IFDIR); @@ -924,6 +1144,8 @@ static int readfd_unbuffered(int fd, char *buf, size_t len) break; case MSG_INFO: case MSG_ERROR: + case MSG_ERROR_XFER: + case MSG_WARNING: if (msg_bytes >= sizeof line) { overflow: rprintf(FERROR, @@ -932,7 +1154,14 @@ static int readfd_unbuffered(int fd, char *buf, size_t len) exit_cleanup(RERR_STREAMIO); } read_loop(fd, line, msg_bytes); - rwrite((enum logcode)tag, line, msg_bytes); + rwrite((enum logcode)tag, line, msg_bytes, 1); + if (first_message) { + if (list_only && !am_sender && tag == 1) { + line[msg_bytes] = '\0'; + check_for_d_option_error(line); + } + first_message = 0; + } break; default: rprintf(FERROR, "unexpected tag %d [%s]\n", @@ -947,11 +1176,8 @@ static int readfd_unbuffered(int fd, char *buf, size_t len) return cnt; } -/** - * Do a buffered read from @p fd. Don't return until all @p n bytes - * have been read. If all @p n can't be read then exit with an - * error. - **/ +/* Do a buffered read from fd. Don't return until all N bytes have + * been read. If all N can't be read then exit with an error. */ static void readfd(int fd, char *buffer, size_t N) { int cnt; @@ -995,66 +1221,96 @@ int32 read_int(int f) return num; } -int64 read_longint(int f) +int32 read_varint(int f) { - int64 num; - char b[9]; + union { + char b[5]; + int32 x; + } u; + uchar ch; + int extra; - if (protocol_version < 30) { - num = read_int(f); + u.x = 0; + readfd(f, (char*)&ch, 1); + extra = int_byte_extra[ch / 4]; + if (extra) { + uchar bit = ((uchar)1<<(8-extra)); + if (extra >= (int)sizeof u.b) { + rprintf(FERROR, "Overflow in read_varint()\n"); + exit_cleanup(RERR_STREAMIO); + } + readfd(f, u.b, extra); + u.b[extra] = ch & (bit-1); + } else + u.b[0] = ch; +#if CAREFUL_ALIGNMENT + u.x = IVAL(u.b,0); +#endif +#if SIZEOF_INT32 > 4 + if (u.x & (int32)0x80000000) + u.x |= ~(int32)0xffffffff; +#endif + return u.x; +} - if ((int32)num != (int32)0xffffffff) - return num; +int64 read_varlong(int f, uchar min_bytes) +{ + union { + char b[9]; + int64 x; + } u; + char b2[8]; + int extra; #if SIZEOF_INT64 < 8 - rprintf(FERROR, "Integer overflow: attempted 64-bit offset\n"); - exit_cleanup(RERR_UNSUPPORTED); + memset(u.b, 0, 8); #else - readfd(f, b, 8); - num = IVAL(b,0) | (((int64)IVAL(b,4))<<32); + u.x = 0; #endif - } else { - int cnt; - readfd(f, b, 3); - cnt = int_byte_cnt[CVAL(b, 0) / 4]; + readfd(f, b2, min_bytes); + memcpy(u.b, b2+1, min_bytes-1); + extra = int_byte_extra[CVAL(b2, 0) / 4]; + if (extra) { + uchar bit = ((uchar)1<<(8-extra)); + if (min_bytes + extra > (int)sizeof u.b) { + rprintf(FERROR, "Overflow in read_varlong()\n"); + exit_cleanup(RERR_STREAMIO); + } + readfd(f, u.b + min_bytes - 1, extra); + u.b[min_bytes + extra - 1] = CVAL(b2, 0) & (bit-1); #if SIZEOF_INT64 < 8 - if (cnt > 5 || (cnt == 5 && (CVAL(b,0)&0x3F || CVAL(b,1)&0x80))) { + if (min_bytes + extra > 5 || u.b[4] || CVAL(u.b,3) & 0x80) { rprintf(FERROR, "Integer overflow: attempted 64-bit offset\n"); exit_cleanup(RERR_UNSUPPORTED); } #endif - if (cnt > 3) - readfd(f, b + 3, cnt - 3); - switch (cnt) { - case 3: - num = NVAL3(b, 0); - break; - case 4: - num = NVAL4(b, 0x80); - break; - case 5: - num = NVAL5(b, 0xC0); - break; + } else + u.b[min_bytes + extra - 1] = CVAL(b2, 0); +#if SIZEOF_INT64 < 8 + u.x = IVAL(u.b,0); +#elif CAREFUL_ALIGNMENT + u.x = IVAL(u.b,0) | (((int64)IVAL(u.b,4))<<32); +#endif + return u.x; +} + +int64 read_longint(int f) +{ #if SIZEOF_INT64 >= 8 - case 6: - num = NVAL6(b, 0xE0); - break; - case 7: - num = NVAL7(b, 0xF0); - break; - case 8: - num = NVAL8(b, 0xF8); - break; - case 9: - num = NVAL8(b+1, 0); - break; + char b[9]; #endif - default: - exit_cleanup(RERR_PROTOCOL); /* impossible... */ - } - } + int32 num = read_int(f); - return num; + if (num != (int32)0xffffffff) + return num; + +#if SIZEOF_INT64 < 8 + rprintf(FERROR, "Integer overflow: attempted 64-bit offset\n"); + exit_cleanup(RERR_UNSUPPORTED); +#else + readfd(f, b, 8); + return IVAL(b,0) | (((int64)IVAL(b,4))<<32); +#endif } void read_buf(int f, char *buf, size_t len) @@ -1098,6 +1354,7 @@ int read_vstring(int f, char *buf, int bufsize) * called by both the sender and the receiver. */ void read_sum_head(int f, struct sum_struct *sum) { + int32 max_blength = protocol_version < 30 ? OLD_MAX_BLOCK_SIZE : MAX_BLOCK_SIZE; sum->count = read_int(f); if (sum->count < 0) { rprintf(FERROR, "Invalid checksum count %ld [%s]\n", @@ -1105,13 +1362,13 @@ void read_sum_head(int f, struct sum_struct *sum) exit_cleanup(RERR_PROTOCOL); } sum->blength = read_int(f); - if (sum->blength < 0 || sum->blength > MAX_BLOCK_SIZE) { + if (sum->blength < 0 || sum->blength > max_blength) { rprintf(FERROR, "Invalid block length %ld [%s]\n", (long)sum->blength, who_am_i()); exit_cleanup(RERR_PROTOCOL); } sum->s2length = protocol_version < 27 ? csum_length : (int)read_int(f); - if (sum->s2length < 0 || sum->s2length > MD4_SUM_LENGTH) { + if (sum->s2length < 0 || sum->s2length > MAX_DIGEST_LEN) { rprintf(FERROR, "Invalid checksum length %d [%s]\n", sum->s2length, who_am_i()); exit_cleanup(RERR_PROTOCOL); @@ -1207,10 +1464,11 @@ static void writefd_unbuffered(int fd, const char *buf, size_t len) size_t n, total = 0; fd_set w_fds, r_fds, e_fds; int maxfd, count, cnt, using_r_fds; - int defer_save = defer_forwarding_messages; + int defer_inc = 0; struct timeval tv; - no_flush++; + if (no_flush++) + defer_forwarding_messages++, defer_inc++; while (total < len) { FD_ZERO(&w_fds); @@ -1242,10 +1500,8 @@ static void writefd_unbuffered(int fd, const char *buf, size_t len) continue; } - if (FD_ISSET(fd, &e_fds)) { - rsyserr(FINFO, errno, - "select exception on fd %d", fd); - } + /*if (FD_ISSET(fd, &e_fds)) + rprintf(FINFO, "select exception on fd %d\n", fd); */ if (using_r_fds && FD_ISSET(msg_fd_in, &r_fds)) read_msg_fd(); @@ -1271,22 +1527,25 @@ static void writefd_unbuffered(int fd, const char *buf, size_t len) /* Don't try to write errors back across the stream. */ if (fd == sock_f_out) io_end_multiplex_out(); + /* Don't try to write errors down a failing msg pipe. */ + if (am_server && fd == msg_fd_out) + exit_cleanup(RERR_STREAMIO); rsyserr(FERROR, errno, "writefd_unbuffered failed to write %ld bytes [%s]", (long)len, who_am_i()); /* If the other side is sending us error messages, try * to grab any messages they sent before they died. */ - while (fd == sock_f_out && io_multiplexing_in) { + while (!am_server && fd == sock_f_out && io_multiplexing_in) { + char buf[1024]; set_io_timeout(30); ignore_timeout = 0; - readfd_unbuffered(sock_f_in, io_filesfrom_buf, - sizeof io_filesfrom_buf); + readfd_unbuffered(sock_f_in, buf, sizeof buf); } exit_cleanup(RERR_STREAMIO); } total += cnt; - defer_forwarding_messages = 1; + defer_forwarding_messages++, defer_inc++; if (fd == sock_f_out) { if (io_timeout || am_generator) @@ -1295,69 +1554,25 @@ static void writefd_unbuffered(int fd, const char *buf, size_t len) } } - defer_forwarding_messages = defer_save; no_flush--; + defer_inc -= defer_forwarding_keep; + if (!(defer_forwarding_messages -= defer_inc) && !no_flush) + msg_flush(); } -static void msg2sndr_flush(void) -{ - if (defer_forwarding_messages) - return; - - while (msg2sndr.head && io_multiplexing_out) { - struct msg_list_item *m = msg2sndr.head; - if (!(msg2sndr.head = m->next)) - msg2sndr.tail = NULL; - stats.total_written += m->len; - defer_forwarding_messages = 1; - writefd_unbuffered(sock_f_out, m->buf, m->len); - defer_forwarding_messages = 0; - free(m); - } -} - -/** - * Write an message to a multiplexed stream. If this fails then rsync - * exits. - **/ -static void mplex_write(enum msgcode code, const char *buf, size_t len) -{ - char buffer[1024]; - size_t n = len; - - SIVAL(buffer, 0, ((MPLEX_BASE + (int)code)<<24) + len); - - if (n > sizeof buffer - 4) - n = 0; - else - memcpy(buffer + 4, buf, n); - - writefd_unbuffered(sock_f_out, buffer, n+4); - - len -= n; - buf += n; - - if (len) { - defer_forwarding_messages = 1; - writefd_unbuffered(sock_f_out, buf, len); - defer_forwarding_messages = 0; - msg2sndr_flush(); - } -} - -void io_flush(UNUSED(int flush_it_all)) +void io_flush(int flush_it_all) { - msg2genr_flush(); - msg2sndr_flush(); - if (!iobuf_out_cnt || no_flush) return; if (io_multiplexing_out) - mplex_write(MSG_DATA, iobuf_out, iobuf_out_cnt); + mplex_write(sock_f_out, MSG_DATA, iobuf_out, iobuf_out_cnt, 0); else writefd_unbuffered(iobuf_f_out, iobuf_out, iobuf_out_cnt); iobuf_out_cnt = 0; + + if (flush_it_all && !defer_forwarding_messages) + msg_flush(); } static void writefd(int fd, const char *buf, size_t len) @@ -1404,106 +1619,81 @@ void write_int(int f, int32 x) writefd(f, b, 4); } -/* - * Note: int64 may actually be a 32-bit type if ./configure couldn't find any - * 64-bit types on this platform. - */ -void write_longint(int f, int64 x) +void write_varint(int f, int32 x) { - char b[12]; + char b[5]; + uchar bit; + int cnt = 4; -#if SIZEOF_INT64 < 8 - if (x < 0 || x > 0x7FFFFFFF) { + SIVAL(b, 1, x); + + while (cnt > 1 && b[cnt] == 0) + cnt--; + bit = ((uchar)1<<(7-cnt+1)); + if (CVAL(b, cnt) >= bit) { + cnt++; + *b = ~(bit-1); + } else if (cnt > 1) + *b = b[cnt] | ~(bit*2-1); + else + *b = b[cnt]; + + writefd(f, b, cnt); +} + +void write_varlong(int f, int64 x, uchar min_bytes) +{ + char b[9]; + uchar bit; + int cnt = 8; + + SIVAL(b, 1, x); +#if SIZEOF_INT64 >= 8 + SIVAL(b, 5, x >> 32); +#else + if (x <= 0x7FFFFFFF && x >= 0) + memset(b + 5, 0, 4); + else { rprintf(FERROR, "Integer overflow: attempted 64-bit offset\n"); exit_cleanup(RERR_UNSUPPORTED); } #endif - if (protocol_version < 30) { - char * const s = b+4; - SIVAL(s, 0, x); -#if SIZEOF_INT64 < 8 + while (cnt > min_bytes && b[cnt] == 0) + cnt--; + bit = ((uchar)1<<(7-cnt+min_bytes)); + if (CVAL(b, cnt) >= bit) { + cnt++; + *b = ~(bit-1); + } else if (cnt > min_bytes) + *b = b[cnt] | ~(bit*2-1); + else + *b = b[cnt]; + + writefd(f, b, cnt); +} + +/* + * Note: int64 may actually be a 32-bit type if ./configure couldn't find any + * 64-bit types on this platform. + */ +void write_longint(int f, int64 x) +{ + char b[12], * const s = b+4; + + SIVAL(s, 0, x); + if (x <= 0x7FFFFFFF && x >= 0) { writefd(f, s, 4); -#else - if (x <= 0x7FFFFFFF && x >= 0) { - writefd(f, s, 4); - return; - } + return; + } - memset(b, 0xFF, 4); - SIVAL(s, 4, x >> 32); - writefd(f, b, 12); - } else if (x < 0) { - goto all_bits; -#endif - } else if (x < ((int32)1<<(3*8-1))) { - b[0] = (char)(x >> 16); - b[1] = (char)(x >> 8); - b[2] = (char)x; - writefd(f, b, 3); - } else if (x < ((int64)1<<(4*8-2))) { - b[0] = (char)((x >> 24) | 0x80); - b[1] = (char)(x >> 16); - b[2] = (char)(x >> 8); - b[3] = (char)x; - writefd(f, b, 4); #if SIZEOF_INT64 < 8 - } else { - b[0] = 0xC0; - b[1] = (char)(x >> 24); - b[2] = (char)(x >> 16); - b[3] = (char)(x >> 8); - b[4] = (char)x; - writefd(f, b, 5); - } + rprintf(FERROR, "Integer overflow: attempted 64-bit offset\n"); + exit_cleanup(RERR_UNSUPPORTED); #else - } else if (x < ((int64)1<<(5*8-3))) { - b[0] = (char)((x >> 32) | 0xC0); - b[1] = (char)(x >> 24); - b[2] = (char)(x >> 16); - b[3] = (char)(x >> 8); - b[4] = (char)x; - writefd(f, b, 5); - } else if (x < ((int64)1<<(6*8-4))) { - b[0] = (char)((x >> 40) | 0xE0); - b[1] = (char)(x >> 32); - b[2] = (char)(x >> 24); - b[3] = (char)(x >> 16); - b[4] = (char)(x >> 8); - b[5] = (char)x; - writefd(f, b, 6); - } else if (x < ((int64)1<<(7*8-5))) { - b[0] = (char)((x >> 48) | 0xF0); - b[1] = (char)(x >> 40); - b[2] = (char)(x >> 32); - b[3] = (char)(x >> 24); - b[4] = (char)(x >> 16); - b[5] = (char)(x >> 8); - b[6] = (char)x; - writefd(f, b, 7); - } else if (x < ((int64)1<<(8*8-6))) { - b[0] = (char)((x >> 56) | 0xF8); - b[1] = (char)(x >> 48); - b[2] = (char)(x >> 40); - b[3] = (char)(x >> 32); - b[4] = (char)(x >> 24); - b[5] = (char)(x >> 16); - b[6] = (char)(x >> 8); - b[7] = (char)x; - writefd(f, b, 8); - } else { - all_bits: - b[0] = (char)0xFC; - b[1] = (char)(x >> 56); - b[2] = (char)(x >> 48); - b[3] = (char)(x >> 40); - b[4] = (char)(x >> 32); - b[5] = (char)(x >> 24); - b[6] = (char)(x >> 16); - b[7] = (char)(x >> 8); - b[8] = (char)x; - writefd(f, b, 9); - } + memset(b, 0xFF, 4); + SIVAL(s, 4, x >> 32); + writefd(f, b, 12); #endif } @@ -1543,16 +1733,95 @@ void write_vstring(int f, const char *str, int len) writefd(f, str, len); } -/** - * Read a line of up to @p maxlen characters into @p buf (not counting - * the trailing null). Strips the (required) trailing newline and all - * carriage returns. - * - * @return 1 for success; 0 for I/O error or truncation. - **/ -int read_line(int f, char *buf, size_t maxlen) +/* Send a file-list index using a byte-reduction method. */ +void write_ndx(int f, int32 ndx) +{ + static int32 prev_positive = -1, prev_negative = 1; + int32 diff, cnt = 0; + char b[6]; + + if (protocol_version < 30 || read_batch) { + write_int(f, ndx); + return; + } + + /* Send NDX_DONE as a single-byte 0 with no side effects. Send + * negative nums as a positive after sending a leading 0xFF. */ + if (ndx >= 0) { + diff = ndx - prev_positive; + prev_positive = ndx; + } else if (ndx == NDX_DONE) { + *b = 0; + writefd(f, b, 1); + return; + } else { + b[cnt++] = (char)0xFF; + ndx = -ndx; + diff = ndx - prev_negative; + prev_negative = ndx; + } + + /* A diff of 1 - 253 is sent as a one-byte diff; a diff of 254 - 32767 + * or 0 is sent as a 0xFE + a two-byte diff; otherwise we send 0xFE + * & all 4 bytes of the (non-negative) num with the high-bit set. */ + if (diff < 0xFE && diff > 0) + b[cnt++] = (char)diff; + else if (diff < 0 || diff > 0x7FFF) { + b[cnt++] = (char)0xFE; + b[cnt++] = (char)((ndx >> 24) | 0x80); + b[cnt++] = (char)ndx; + b[cnt++] = (char)(ndx >> 8); + b[cnt++] = (char)(ndx >> 16); + } else { + b[cnt++] = (char)0xFE; + b[cnt++] = (char)(diff >> 8); + b[cnt++] = (char)diff; + } + writefd(f, b, cnt); +} + +/* Receive a file-list index using a byte-reduction method. */ +int32 read_ndx(int f) +{ + static int32 prev_positive = -1, prev_negative = 1; + int32 *prev_ptr, num; + char b[4]; + + if (protocol_version < 30) + return read_int(f); + + readfd(f, b, 1); + if (CVAL(b, 0) == 0xFF) { + readfd(f, b, 1); + prev_ptr = &prev_negative; + } else if (CVAL(b, 0) == 0) + return NDX_DONE; + else + prev_ptr = &prev_positive; + if (CVAL(b, 0) == 0xFE) { + readfd(f, b, 2); + if (CVAL(b, 0) & 0x80) { + b[3] = CVAL(b, 0) & ~0x80; + b[0] = b[1]; + readfd(f, b+1, 2); + num = IVAL(b, 0); + } else + num = (UVAL(b,0)<<8) + UVAL(b,1) + *prev_ptr; + } else + num = UVAL(b, 0) + *prev_ptr; + *prev_ptr = num; + if (prev_ptr == &prev_negative) + num = -num; + return num; +} + +/* Read a line of up to bufsiz-1 characters into buf. Strips + * the (required) trailing newline and all carriage returns. + * Returns 1 for success; 0 for I/O error or truncation. */ +int read_line_old(int f, char *buf, size_t bufsiz) { - while (maxlen) { + bufsiz--; /* leave room for the null */ + while (bufsiz > 0) { buf[0] = 0; read_buf(f, buf, 1); if (buf[0] == 0) @@ -1561,11 +1830,11 @@ int read_line(int f, char *buf, size_t maxlen) break; if (buf[0] != '\r') { buf++; - maxlen--; + bufsiz--; } } *buf = '\0'; - return maxlen > 0; + return bufsiz > 0; } void io_printf(int fd, const char *format, ...) @@ -1606,13 +1875,13 @@ void io_start_multiplex_in(void) } /** Write an message to the multiplexed data stream. */ -int io_multiplex_write(enum msgcode code, const char *buf, size_t len) +int io_multiplex_write(enum msgcode code, const char *buf, size_t len, int convert) { if (!io_multiplexing_out) return 0; io_flush(NORMAL_FLUSH); stats.total_written += (len+4); - mplex_write(code, buf, len); + mplex_write(sock_f_out, code, buf, len, convert); return 1; } @@ -1637,6 +1906,8 @@ void start_write_batch(int fd) * actual communication so far depends on whether a daemon * is involved. */ write_int(batch_fd, protocol_version); + if (protocol_version >= 30) + write_byte(batch_fd, inc_recurse); write_int(batch_fd, checksum_seed); if (am_sender)