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 we start a sub-shell to let the user fix a rebase, output a
[rsync/rsync.git]
/
cleanup.c
diff --git
a/cleanup.c
b/cleanup.c
index
d35d77a
..
2ded302
100644
(file)
--- a/
cleanup.c
+++ b/
cleanup.c
@@
-78,8
+78,8
@@
void close_all(void)
**/
int cleanup_got_literal = 0;
**/
int cleanup_got_literal = 0;
-static char *cleanup_fname;
-static char *cleanup_new_fname;
+static c
onst c
har *cleanup_fname;
+static c
onst c
har *cleanup_new_fname;
static struct file_struct *cleanup_file;
static int cleanup_fd_r, cleanup_fd_w;
static pid_t cleanup_pid = 0;
static struct file_struct *cleanup_file;
static int cleanup_fd_r, cleanup_fd_w;
static pid_t cleanup_pid = 0;
@@
-103,6
+103,11
@@
NORETURN void _exit_cleanup(int code, const char *file, int line)
if (exit_code) /* Preserve first error code when recursing. */
code = exit_code;
if (exit_code) /* Preserve first error code when recursing. */
code = exit_code;
+ /* If this is the exit at the end of the run, the server side
+ * should not attempt to output a message (see log.c). */
+ if (am_server && code == 0)
+ am_server = 2;
+
/* Some of our actions might cause a recursive call back here, so we
* keep track of where we are in the cleanup and never repeat a step. */
switch (cleanup_step) {
/* Some of our actions might cause a recursive call back here, so we
* keep track of where we are in the cleanup and never repeat a step. */
switch (cleanup_step) {
@@
-134,7
+139,7
@@
NORETURN void _exit_cleanup(int code, const char *file, int line)
if (cleanup_got_literal && cleanup_fname && cleanup_new_fname
&& keep_partial && handle_partial_dir(cleanup_new_fname, PDIR_CREATE)) {
if (cleanup_got_literal && cleanup_fname && cleanup_new_fname
&& keep_partial && handle_partial_dir(cleanup_new_fname, PDIR_CREATE)) {
- char *fname = cleanup_fname;
+ c
onst c
har *fname = cleanup_fname;
cleanup_fname = NULL;
if (cleanup_fd_r != -1)
close(cleanup_fd_r);
cleanup_fname = NULL;
if (cleanup_fd_r != -1)
close(cleanup_fd_r);
@@
-208,7
+213,7
@@
void cleanup_disable(void)
}
}
-void cleanup_set(c
har *fnametmp,
char *fname, struct file_struct *file,
+void cleanup_set(c
onst char *fnametmp, const
char *fname, struct file_struct *file,
int fd_r, int fd_w)
{
cleanup_fname = fnametmp;
int fd_r, int fd_w)
{
cleanup_fname = fnametmp;