X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/37ce167996540b7971e3e966c26e0fc64a1f8dbe..6d56efa6ea66afa2e6f4eb79d9dd5f3b54b723c3:/io.c diff --git a/io.c b/io.c index cb485b85..6e5c2329 100644 --- a/io.c +++ b/io.c @@ -4,7 +4,7 @@ * Copyright (C) 1996-2001 Andrew Tridgell * Copyright (C) 1996 Paul Mackerras * Copyright (C) 2001, 2002 Martin Pool - * Copyright (C) 2003-2007 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 @@ -45,6 +45,7 @@ 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; @@ -100,10 +101,11 @@ static char ff_lastchar; #ifdef ICONV_OPTION static xbuf iconv_buf = EMPTY_XBUF; #endif -static int defer_forwarding_messages = 0; +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_extra[64] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* (00 - 3F)/4 */ @@ -112,6 +114,9 @@ static char int_byte_extra[64] = { 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 5, 6, /* (C0 - FF)/4 */ }; +#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); @@ -321,6 +326,36 @@ static void msg_flush(void) } } +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 @@ -373,7 +408,7 @@ static void read_msg_fd(void) /* Read extra file list from receiver. */ assert(iobuf_in != NULL); assert(iobuf_f_in == fd); - if (verbose > 3) { + if (DEBUG_GTE(FLIST, 2)) { rprintf(FINFO, "[%s] receiving flist for dir %d\n", who_am_i(), IVAL(buf,0)); } @@ -413,15 +448,17 @@ static void read_msg_fd(void) 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; @@ -440,7 +477,7 @@ static void read_msg_fd(void) no_flush--; msg_fd_in = fd; - if (!--defer_forwarding_messages) + if (!--defer_forwarding_messages && !no_flush) msg_flush(); } @@ -468,46 +505,41 @@ static void mplex_write(int fd, enum msgcode code, const char *buf, size_t len, char buffer[BIGPATHBUFLEN]; /* Oversized for use by iconv code. */ size_t n = len; - SIVAL(buffer, 0, ((MPLEX_BASE + (int)code)<<24) + len); - #ifdef ICONV_OPTION - if (convert && ic_send == (iconv_t)-1) -#endif - convert = 0; + /* 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; + + INIT_XBUF(outbuf, buffer + 4, 0, sizeof buffer - 4); + INIT_XBUF(inbuf, (char*)buf, len, -1); - if (convert || n > 1024 - 4) /* BIGPATHBUFLEN can handle 1024 bytes */ - n = 0; + 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); + } + + 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); - writefd_unbuffered(fd, buffer, n+4); - - len -= n; - buf += n; + SIVAL(buffer, 0, ((MPLEX_BASE + (int)code)<<24) + len); -#ifdef ICONV_OPTION - if (convert) { - xbuf outbuf, inbuf; + defer_forwarding_keep = 1; /* defer_forwarding_messages++ on return */ + writefd_unbuffered(fd, buffer, n+4); + defer_forwarding_keep = 0; - INIT_CONST_XBUF(outbuf, buffer); - INIT_XBUF(inbuf, (char*)buf, len, -1); + if (len > n) + writefd_unbuffered(fd, buf+n, len-n); - defer_forwarding_messages++; - do { - iconvbufs(ic_send, &inbuf, &outbuf, - ICB_INCLUDE_BAD | ICB_INCLUDE_INCOMPLETE); - writefd_unbuffered(fd, outbuf.buf, outbuf.len); - } while (inbuf.len); - if (!--defer_forwarding_messages) - msg_flush(); - } else -#endif - if (len) { - defer_forwarding_messages++; - writefd_unbuffered(fd, buf, len); - if (!--defer_forwarding_messages) - msg_flush(); - } + if (!--defer_forwarding_messages && !no_flush) + msg_flush(); } int send_msg(enum msgcode code, const char *buf, int len, int convert) @@ -597,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); } @@ -756,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); @@ -841,8 +873,8 @@ int read_line(int fd, char *buf, size_t bufsiz, int flags) return s - buf; } -int 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) +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; @@ -856,14 +888,14 @@ int read_args(int f_in, char *mod_name, char *buf, size_t bufsiz, int rl_nulls, if (!(argv = new_array(char *, maxargs))) out_of_memory("read_args"); - if (mod_name) + if (mod_name && !protect_args) argv[argc++] = "rsyncd"; while (1) { if (read_line(f_in, buf, bufsiz, rl_flags) == 0) break; - if (argc == maxargs) { + if (argc == maxargs-1) { maxargs += MAX_ARGS; if (!(argv = realloc_array(argv, char *, maxargs))) out_of_memory("read_args"); @@ -886,11 +918,12 @@ int read_args(int f_in, char *mod_name, char *buf, size_t bufsiz, int rl_nulls, dot_pos = argc; } } + argv[argc] = NULL; + + glob_expand(NULL, NULL, NULL, NULL); *argc_p = argc; *argv_p = argv; - - return dot_pos ? dot_pos : argc; } int io_start_buffering_out(int f_out) @@ -1062,7 +1095,7 @@ static int readfd_unbuffered(int fd, char *buf, size_t len) int pos = 0; INIT_CONST_XBUF(outbuf, line); - inbuf.buf = ibuf; + INIT_XBUF(inbuf, ibuf, 0, -1); while (msg_bytes) { inbuf.len = msg_bytes > sizeof ibuf @@ -1111,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, @@ -1120,6 +1155,13 @@ static int readfd_unbuffered(int fd, char *buf, size_t len) } read_loop(fd, 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", @@ -1312,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", @@ -1319,7 +1362,7 @@ 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); @@ -1512,7 +1555,8 @@ static void writefd_unbuffered(int fd, const char *buf, size_t len) } no_flush--; - if (!(defer_forwarding_messages -= defer_inc)) + defer_inc -= defer_forwarding_keep; + if (!(defer_forwarding_messages -= defer_inc) && !no_flush) msg_flush(); }