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
Moved an extern.
[rsync/rsync.git]
/
main.c
diff --git
a/main.c
b/main.c
index
52ec58e
..
2833435
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-238,7
+238,8
@@
static void output_summary(void)
human_num(stats.literal_data));
rprintf(FINFO,"Matched data: %s bytes\n",
human_num(stats.matched_data));
human_num(stats.literal_data));
rprintf(FINFO,"Matched data: %s bytes\n",
human_num(stats.matched_data));
- rprintf(FINFO,"File list size: %d\n", stats.flist_size);
+ rprintf(FINFO,"File list size: %s\n",
+ human_num(stats.flist_size));
if (stats.flist_buildtime) {
rprintf(FINFO,
"File list generation time: %.3f seconds\n",
if (stats.flist_buildtime) {
rprintf(FINFO,
"File list generation time: %.3f seconds\n",
@@
-618,7
+619,7
@@
static void read_final_goodbye(int f_in, int f_out)
}
}
}
}
- if (i !=
-1
) {
+ if (i !=
NDX_DONE
) {
rprintf(FERROR, "Invalid packet at end of run (%d) [%s]\n",
i, who_am_i());
exit_cleanup(RERR_PROTOCOL);
rprintf(FERROR, "Invalid packet at end of run (%d) [%s]\n",
i, who_am_i());
exit_cleanup(RERR_PROTOCOL);
@@
-767,7
+768,7
@@
static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
io_flush(FULL_FLUSH);
if (protocol_version >= 24) {
/* send a final goodbye message */
io_flush(FULL_FLUSH);
if (protocol_version >= 24) {
/* send a final goodbye message */
- write_int(f_out,
-1
);
+ write_int(f_out,
NDX_DONE
);
}
io_flush(FULL_FLUSH);
}
io_flush(FULL_FLUSH);
@@
-1258,8
+1259,8
@@
static RETSIGTYPE rsync_panic_handler(UNUSED(int whatsig))
char cmd_buf[300];
int ret;
char cmd_buf[300];
int ret;
- s
printf(
cmd_buf, get_panic_action(),
- getpid(), getpid());
+ s
nprintf(cmd_buf, sizeof
cmd_buf, get_panic_action(),
+
getpid(), getpid());
/* Unless we failed to execute gdb, we allow the process to
* continue. I'm not sure if that's right. */
/* Unless we failed to execute gdb, we allow the process to
* continue. I'm not sure if that's right. */