X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/951e826b75c4a4e6bc066e248d7489fb6eba6fde..1a2e41af941573e69c02370329afe0192b61f213:/sender.c diff --git a/sender.c b/sender.c index 6aa5aeb8..e3a896af 100644 --- a/sender.c +++ b/sender.c @@ -3,7 +3,7 @@ * * Copyright (C) 1996 Andrew Tridgell * Copyright (C) 1996 Paul Mackerras - * Copyright (C) 2003-2008 Wayne Davison + * Copyright (C) 2003-2009 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 @@ -20,8 +20,8 @@ */ #include "rsync.h" +#include "inums.h" -extern int dry_run; extern int do_xfers; extern int am_server; extern int am_daemon; @@ -69,9 +69,9 @@ static struct sum_struct *receive_sums(int f) s->sums = NULL; - if (DEBUG_GTE(CHKSUM, 3)) { - rprintf(FINFO, "count=%.0f n=%ld rem=%ld\n", - (double)s->count, (long)s->blength, (long)s->remainder); + if (DEBUG_GTE(DELTASUM, 3)) { + rprintf(FINFO, "count=%s n=%ld rem=%ld\n", + big_num(s->count), (long)s->blength, (long)s->remainder); } if (append_mode > 0) { @@ -103,10 +103,10 @@ static struct sum_struct *receive_sums(int f) if (allowed_lull && !(i % lull_mod)) maybe_send_keepalive(); - if (DEBUG_GTE(CHKSUM, 3)) { + if (DEBUG_GTE(DELTASUM, 3)) { rprintf(FINFO, - "chunk[%d] len=%d offset=%.0f sum1=%08x\n", - i, s->sums[i].len, (double)s->sums[i].offset, + "chunk[%d] len=%d offset=%s sum1=%08x\n", + i, s->sums[i].len, big_num(s->sums[i].offset), s->sums[i].sum1); } } @@ -125,13 +125,7 @@ void successful_send(int ndx) if (!remove_source_files) return; - if (!(flist = flist_for_ndx(ndx))) { - rprintf(FERROR, - "INTERNAL ERROR: unable to find flist for item %d\n", - ndx); - return; - } - + flist = flist_for_ndx(ndx, "successful_send"); file = flist->files[ndx - flist->ndx_start]; if (!change_pathname(file, NULL, 0)) return; @@ -157,7 +151,7 @@ static void write_ndx_and_attrs(int f_out, int ndx, int iflags, if (iflags & ITEM_XNAME_FOLLOWS) write_vstring(f_out, buf, len); #ifdef SUPPORT_XATTRS - if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && !dry_run) + if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && do_xfers) send_xattr_request(fname, file, f_out); #endif } @@ -178,6 +172,7 @@ void send_files(int f_in, int f_out) int itemizing = am_server ? logfile_format_has_i : stdout_format_has_i; enum logcode log_code = log_before_transfer ? FLOG : FINFO; int f_xfer = write_batch < 0 ? batch_fd : f_out; + int save_io_error = io_error; int ndx, j; if (DEBUG_GTE(SEND, 1)) @@ -185,7 +180,7 @@ void send_files(int f_in, int f_out) while (1) { if (inc_recurse) - send_extra_file_list(f_out, FILECNT_LOOKAHEAD); + send_extra_file_list(f_out, MIN_FILECNT_LOOKAHEAD); /* This call also sets cur_flist. */ ndx = read_ndx_and_attrs(f_in, &iflags, &fnamecmp_type, @@ -211,7 +206,7 @@ void send_files(int f_in, int f_out) } if (inc_recurse) - send_extra_file_list(f_out, FILECNT_LOOKAHEAD); + send_extra_file_list(f_out, MIN_FILECNT_LOOKAHEAD); if (ndx - cur_flist->ndx_start >= 0) file = cur_flist->files[ndx - cur_flist->ndx_start]; @@ -231,7 +226,7 @@ void send_files(int f_in, int f_out) rprintf(FINFO, "send_files(%d, %s%s%s)\n", ndx, path,slash,fname); #ifdef SUPPORT_XATTRS - if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && !dry_run) + if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && do_xfers) recv_xattr_request(file, f_in); #endif @@ -239,6 +234,21 @@ void send_files(int f_in, int f_out) maybe_log_item(file, iflags, itemizing, xname); write_ndx_and_attrs(f_out, ndx, iflags, fname, file, fnamecmp_type, xname, xlen); + if (iflags & ITEM_IS_NEW) { + stats.created_files++; + if (S_ISREG(file->mode)) { + /* Nothing further to count. */ + } else if (S_ISDIR(file->mode)) + stats.created_dirs++; +#ifdef SUPPORT_LINKS + else if (S_ISLNK(file->mode)) + stats.created_symlinks++; +#endif + else if (IS_DEVICE(file->mode)) + stats.created_devices++; + else + stats.created_specials++; + } continue; } if (phase == 2) { @@ -262,6 +272,8 @@ void send_files(int f_in, int f_out) append_mode = -append_mode; csum_length = SHORT_SUM_LENGTH; } + if (iflags & ITEM_IS_NEW) + stats.created_files++; } updating_basis_file = inplace && (protocol_version >= 29 @@ -269,7 +281,7 @@ void send_files(int f_in, int f_out) if (!am_server && INFO_GTE(PROGRESS, 1)) set_current_file_index(file, ndx); - stats.num_transferred_files++; + stats.xferred_files++; stats.total_transferred_size += F_LENGTH(file); if (!do_xfers) { /* log the transfer */ @@ -283,7 +295,7 @@ void send_files(int f_in, int f_out) if (!(s = receive_sums(f_in))) { io_error |= IOERR_GENERAL; - rprintf(FERROR, "receive_sums failed\n"); + rprintf(FERROR_XFER, "receive_sums failed\n"); exit_cleanup(RERR_PROTOCOL); } @@ -311,7 +323,7 @@ void send_files(int f_in, int f_out) /* map the local file */ if (do_fstat(fd, &st) != 0) { io_error |= IOERR_GENERAL; - rsyserr(FERROR, errno, "fstat failed"); + rsyserr(FERROR_XFER, errno, "fstat failed"); free_sums(s); close(fd); exit_cleanup(RERR_PROTOCOL); @@ -323,16 +335,16 @@ void send_files(int f_in, int f_out) } else mbuf = NULL; - if (DEBUG_GTE(CHKSUM, 2)) { - rprintf(FINFO, "send_files mapped %s%s%s of size %.0f\n", - path,slash,fname, (double)st.st_size); + if (DEBUG_GTE(DELTASUM, 2)) { + rprintf(FINFO, "send_files mapped %s%s%s of size %s\n", + path,slash,fname, big_num(st.st_size)); } write_ndx_and_attrs(f_out, ndx, iflags, fname, file, fnamecmp_type, xname, xlen); write_sum_head(f_xfer, s); - if (DEBUG_GTE(CHKSUM, 2)) + if (DEBUG_GTE(DELTASUM, 2)) rprintf(FINFO, "calling match_sums %s%s%s\n", path,slash,fname); if (log_before_transfer) @@ -370,6 +382,9 @@ void send_files(int f_in, int f_out) if (make_backups < 0) make_backups = -make_backups; + if (io_error != save_io_error && protocol_version >= 30) + send_msg_int(MSG_IO_ERROR, io_error); + if (DEBUG_GTE(SEND, 1)) rprintf(FINFO, "send files finished\n");