* 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
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 {
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;
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)
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, 0);
- }
- 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:
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, int convert)
{
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;
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)
if (protocol_version >= 30)
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);
}
}
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();
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff