*
* 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
*/
#include "rsync.h"
+#include "inums.h"
extern int dry_run;
extern int do_xfers;
s->sums = NULL;
- if (DEBUG_GTE(CHKSUM, 3)) {
+ if (DEBUG_GTE(DELTASUM, 3)) {
rprintf(FINFO, "count=%s n=%ld rem=%ld\n",
- big_num(s->count, 0), (long)s->blength, (long)s->remainder);
+ big_num(s->count), (long)s->blength, (long)s->remainder);
}
if (append_mode > 0) {
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=%s sum1=%08x\n",
- i, s->sums[i].len, big_num(s->sums[i].offset, 0),
+ i, s->sums[i].len, big_num(s->sums[i].offset),
s->sums[i].sum1);
}
}
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;
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) {
append_mode = -append_mode;
csum_length = SHORT_SUM_LENGTH;
}
+ if (iflags & ITEM_IS_NEW)
+ stats.created_files++;
}
updating_basis_file = inplace && (protocol_version >= 29
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 */
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);
}
/* 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);
} else
mbuf = NULL;
- if (DEBUG_GTE(CHKSUM, 2)) {
+ 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, 0));
+ 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)