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
If the user specifies --protocol=29, rsync will avoid sending an -e
[rsync/rsync.git]
/
cleanup.c
diff --git
a/cleanup.c
b/cleanup.c
index
2ded302
..
279b532
100644
(file)
--- a/
cleanup.c
+++ b/
cleanup.c
@@
-4,7
+4,7
@@
* Copyright (C) 1996-2000 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
* Copyright (C) 2002 Martin Pool
* Copyright (C) 1996-2000 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
* Copyright (C) 2002 Martin Pool
- * Copyright (C) 2003-200
7
Wayne Davison
+ * Copyright (C) 2003-200
8
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
*
* 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
@@
-26,7
+26,8
@@
extern int am_server;
extern int am_daemon;
extern int io_error;
extern int keep_partial;
extern int am_daemon;
extern int io_error;
extern int keep_partial;
-extern int log_got_error;
+extern int got_xfer_error;
+extern int progress_is_active;
extern char *partial_dir;
extern char *logfile_name;
extern char *partial_dir;
extern char *logfile_name;
@@
-115,6
+116,11
@@
NORETURN void _exit_cleanup(int code, const char *file, int line)
exit_code = unmodified_code = code;
exit_code = unmodified_code = code;
+ if (progress_is_active) {
+ fputc('\n', stdout);
+ progress_is_active = 0;
+ }
+
if (verbose > 3) {
rprintf(FINFO,
"_exit_cleanup(code=%d, file=%s, line=%d): entered\n",
if (verbose > 3) {
rprintf(FINFO,
"_exit_cleanup(code=%d, file=%s, line=%d): entered\n",
@@
-174,7
+180,7
@@
NORETURN void _exit_cleanup(int code, const char *file, int line)
code = exit_code = RERR_DEL_LIMIT;
if (io_error & IOERR_VANISHED)
code = exit_code = RERR_VANISHED;
code = exit_code = RERR_DEL_LIMIT;
if (io_error & IOERR_VANISHED)
code = exit_code = RERR_VANISHED;
- if (io_error & IOERR_GENERAL ||
log_got
_error)
+ if (io_error & IOERR_GENERAL ||
got_xfer
_error)
code = exit_code = RERR_PARTIAL;
}
code = exit_code = RERR_PARTIAL;
}