Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding human_readable var.
[rsync/rsync.git]
/
sender.c
diff --git
a/sender.c
b/sender.c
index
9c550e9
..
3937a10
100644
(file)
--- a/
sender.c
+++ b/
sender.c
@@
-20,6
+20,7
@@
*/
#include "rsync.h"
*/
#include "rsync.h"
+#include "inums.h"
extern int dry_run;
extern int do_xfers;
extern int dry_run;
extern int do_xfers;
@@
-71,7
+72,7
@@
static struct sum_struct *receive_sums(int f)
if (DEBUG_GTE(DELTASUM, 3)) {
rprintf(FINFO, "count=%s n=%ld rem=%ld\n",
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 (append_mode > 0) {
@@
-106,7
+107,7
@@
static struct sum_struct *receive_sums(int f)
if (DEBUG_GTE(DELTASUM, 3)) {
rprintf(FINFO,
"chunk[%d] len=%d offset=%s sum1=%08x\n",
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);
}
}
s->sums[i].sum1);
}
}
@@
-125,13
+126,7
@@
void successful_send(int ndx)
if (!remove_source_files)
return;
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;
file = flist->files[ndx - flist->ndx_start];
if (!change_pathname(file, NULL, 0))
return;
@@
-283,7
+278,7
@@
void send_files(int f_in, int f_out)
if (!(s = receive_sums(f_in))) {
io_error |= IOERR_GENERAL;
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);
}
exit_cleanup(RERR_PROTOCOL);
}
@@
-311,7
+306,7
@@
void send_files(int f_in, int f_out)
/* map the local file */
if (do_fstat(fd, &st) != 0) {
io_error |= IOERR_GENERAL;
/* 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);
free_sums(s);
close(fd);
exit_cleanup(RERR_PROTOCOL);
@@
-325,7
+320,7
@@
void send_files(int f_in, int f_out)
if (DEBUG_GTE(DELTASUM, 2)) {
rprintf(FINFO, "send_files mapped %s%s%s of size %s\n",
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,
}
write_ndx_and_attrs(f_out, ndx, iflags, fname, file,