* Copyright (C) 2003-2007 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* 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
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;
+#ifdef ICONV_OPTION
+extern iconv_t ic_send, ic_recv;
+#endif
const char phase_unknown[] = "unknown";
int ignore_timeout = 0;
static int io_filesfrom_f_in = -1;
static int io_filesfrom_f_out = -1;
static char io_filesfrom_buf[2048];
+#ifdef ICONV_OPTION
+static char iconv_buf[sizeof io_filesfrom_buf / 2];
+#endif
static char *io_filesfrom_bp;
static char io_filesfrom_lastchar;
static int io_filesfrom_buflen;
2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 5, 6, /* (C0 - FF)/4 */
};
+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;
struct msg_list_item {
struct msg_list_item *next;
- int len;
+ char convert;
char buf[1];
};
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);
+ assert(ndx >= flist->ndx_start);
+
+ 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);
+ }
+ 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;
}
/* 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;
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)
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 += m->len;
+ stats.total_written += len + 4;
defer_forwarding_messages++;
- writefd_unbuffered(sock_f_out, m->buf, m->len);
+ 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++;
- writefd_unbuffered(msg_fd_out, m->buf, m->len);
+ mplex_write(msg_fd_out, tag, m->buf + 4, len, m->convert);
defer_forwarding_messages--;
free(m);
}
if (len != 4 || !am_generator)
goto invalid_msg;
readfd(fd, buf, 4);
- if (remove_source_files)
- decrement_active_files(IVAL(buf,0));
- flist_ndx_push(&redo_list, IVAL(buf,0));
- if (inc_recurse)
- decrement_flist_in_progress(IVAL(buf,0), 1);
+ got_flist_entry_status(FES_REDO, buf);
break;
case MSG_FLIST:
if (len != 4 || !am_generator || !inc_recurse)
/* Read extra file list from receiver. */
assert(iobuf_in != NULL);
assert(iobuf_f_in == fd);
+ if (verbose > 3) {
+ 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 || !inc_recurse)
if (len >= (int)sizeof buf || !am_generator)
goto invalid_msg;
readfd(fd, buf, len);
- send_msg(MSG_DELETED, buf, len);
+ send_msg(MSG_DELETED, buf, len, 1);
break;
case MSG_SUCCESS:
if (len != 4 || !am_generator)
goto invalid_msg;
- readfd(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 (inc_recurse)
- 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(fd, buf, len);
- if (inc_recurse)
- 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_CLIENT:
if (n >= sizeof buf)
n = sizeof buf - 1;
readfd(fd, buf, n);
- rwrite((enum logcode)tag, buf, n);
+ rwrite((enum logcode)tag, buf, n, !am_generator);
len -= n;
}
break;
active_bytecnt += F_LENGTH(cur_flist->files[ndx - cur_flist->ndx_start]);
}
-static void decrement_active_files(int ndx)
-{
- struct file_list *flist = flist_for_ndx(ndx);
- assert(flist != NULL);
- active_filecnt--;
- active_bytecnt -= F_LENGTH(flist->files[ndx - flist->ndx_start]);
-}
-
-static void decrement_flist_in_progress(int ndx, int redo)
-{
- struct file_list *flist = cur_flist ? cur_flist : first_flist;
-
- 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);
- }
- 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++;
-}
-
/* 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)
+static void mplex_write(int fd, enum msgcode code, const char *buf, size_t len, int convert)
{
- char buffer[1024];
+ char buffer[BIGPATHBUFLEN]; /* Oversized for use by iconv code. */
size_t n = len;
SIVAL(buffer, 0, ((MPLEX_BASE + (int)code)<<24) + len);
- if (n > sizeof buffer - 4)
+#ifdef ICONV_OPTION
+ if (convert && ic_send == (iconv_t)-1)
+#endif
+ convert = 0;
+
+ if (convert || n > 1024 - 4) /* BIGPATHBUFLEN can handle 1024 bytes */
n = 0;
else
memcpy(buffer + 4, buf, n);
len -= n;
buf += n;
+#ifdef ICONV_OPTION
+ if (convert) {
+ iconv(ic_send, NULL, 0, NULL, 0);
+ defer_forwarding_messages++;
+ while (len) {
+ ICONV_CONST char *ibuf = (ICONV_CONST char *)buf;
+ char *obuf = buffer;
+ size_t ocnt = sizeof buffer;
+ while (len && iconv(ic_send, &ibuf,&len,
+ &obuf,&ocnt) == (size_t)-1) {
+ if (errno == E2BIG || !ocnt)
+ break;
+ *obuf++ = *ibuf++;
+ ocnt--, len--;
+ }
+ n = obuf - buffer;
+ writefd_unbuffered(fd, buffer, n);
+ }
+ if (!--defer_forwarding_messages)
+ msg_flush();
+ } else
+#endif
if (len) {
defer_forwarding_messages++;
writefd_unbuffered(fd, buf, len);
}
}
-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(&msg_queue, code, buf, len);
+ msg_list_add(&msg_queue, code, buf, len, convert);
return 1;
}
if (flist_forward_from >= 0)
- msg_list_add(&msg_queue, code, buf, len);
+ msg_list_add(&msg_queue, code, buf, len, convert);
else
- mplex_write(msg_fd_out, code, buf, len);
+ mplex_write(msg_fd_out, code, buf, len, convert);
return 1;
}
{
char numbuf[4];
SIVAL(numbuf, 0, num);
- send_msg(code, numbuf, 4);
+ send_msg(code, numbuf, 4, 0);
}
void wait_for_receiver(void)
io_filesfrom_bp = io_filesfrom_buf;
else
io_filesfrom_bp += l;
- } else {
+ } else if (errno != EINTR) {
/* XXX should we complain? */
io_filesfrom_f_out = -1;
}
io_filesfrom_buf,
sizeof io_filesfrom_buf);
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 */
+ io_filesfrom_buf[0] = '\0';
+ io_filesfrom_buf[1] = '\0';
+ io_filesfrom_buflen = io_filesfrom_lastchar? 2 : 1;
+ io_filesfrom_f_in = -1;
+ }
} else {
if (!eol_nulls) {
char *s = io_filesfrom_buf + l;
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 dump_comments, int rl_nulls)
{
- char ch, *s, *eob = fname + MAXPATHLEN - 1;
+ char ch, *s, *eob = buf + bufsiz - 1;
int cnt;
- int reading_remotely = filesfrom_host != NULL;
- int nulls = eol_nulls || reading_remotely;
start:
- s = fname;
+ s = buf;
while (1) {
cnt = read(fd, &ch, 1);
if (cnt < 0 && (errno == EWOULDBLOCK
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 (rl_nulls ? ch == '\0' : (ch == '\r' || ch == '\n')) {
+ /* Skip empty lines if dumping comments. */
+ if (dump_comments && s == buf)
continue;
break;
}
}
*s = '\0';
- /* Dump comments. */
- if (*fname == '#' || *fname == ';')
+ if (dump_comments && (*buf == '#' || *buf == ';'))
goto start;
- return s - fname;
+ 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)
+{
+ int maxargs = MAX_ARGS;
+ int dot_pos = 0;
+ int argc = 0;
+ char **argv, *p;
+
+ if (!(argv = new_array(char *, maxargs)))
+ out_of_memory("read_args");
+ if (mod_name)
+ argv[argc++] = "rsyncd";
+
+ while (1) {
+ if (read_line(f_in, buf, bufsiz, 0, rl_nulls) == 0)
+ break;
+
+ if (argc == maxargs) {
+ 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;
+ }
+ }
+
+ *argc_p = argc;
+ *argv_p = argv;
+
+ return dot_pos ? dot_pos : argc;
}
int io_start_buffering_out(int f_out)
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);
}
}
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) {
+ ICONV_CONST char *ibuf;
+ char *obuf = line;
+ size_t icnt, ocnt = sizeof line - 1;
+ int add_null = 0;
+ iconv(ic_send, NULL, 0, NULL, 0);
+ while (msg_bytes) {
+ icnt = msg_bytes > sizeof iconv_buf
+ ? sizeof iconv_buf : msg_bytes;
+ read_loop(fd, iconv_buf, icnt);
+ if (!(msg_bytes -= icnt) && !iconv_buf[icnt-1])
+ icnt--, add_null = 1;
+ ibuf = (ICONV_CONST char *)iconv_buf;
+ if (iconv(ic_send, &ibuf,&icnt,
+ &obuf,&ocnt) == (size_t)-1)
+ goto overflow; // XXX
+ }
+ if (add_null)
+ *obuf++ = '\0';
+ msg_bytes = obuf - line;
+ } 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);
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);
break;
default:
rprintf(FERROR, "unexpected tag %d [%s]\n",
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();
(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) {
set_io_timeout(30);
ignore_timeout = 0;
readfd_unbuffered(sock_f_in, io_filesfrom_buf,
return;
if (io_multiplexing_out)
- mplex_write(sock_f_out, 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;
return num;
}
-/**
- * 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)
+/* 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)
break;
if (buf[0] != '\r') {
buf++;
- maxlen--;
+ bufsiz--;
}
}
*buf = '\0';
- return maxlen > 0;
+ return bufsiz > 0;
}
void io_printf(int fd, const char *format, ...)
}
/** 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(sock_f_out, code, buf, len);
+ mplex_write(sock_f_out, code, buf, len, convert);
return 1;
}
* actual communication so far depends on whether a daemon
* is involved. */
write_int(batch_fd, protocol_version);
- if (protocol_version >= 30) {
- int sub = protocol_version == PROTOCOL_VERSION
- ? SUBPROTOCOL_VERSION : 0;
- write_varint(batch_fd, sub);
- }
write_int(batch_fd, checksum_seed);
if (am_sender)
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff