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
Use `id -G` rather than `groups` to get a list of groups for this
[rsync/rsync.git]
/
cleanup.c
diff --git
a/cleanup.c
b/cleanup.c
index
4b9cad3
..
480c200
100644
(file)
--- a/
cleanup.c
+++ b/
cleanup.c
@@
-33,6
+33,7
@@
static struct map_struct *cleanup_buf;
static int cleanup_pid = 0;
extern int io_error;
static int cleanup_pid = 0;
extern int io_error;
+pid_t cleanup_child_pid = -1;
/*
* Code is one of the RERR_* codes from errcode.h.
/*
* Code is one of the RERR_* codes from errcode.h.
@@
-42,11
+43,17
@@
void _exit_cleanup(int code, const char *file, int line)
extern int keep_partial;
extern int log_got_error;
extern int keep_partial;
extern int log_got_error;
- if (code == 0 && io_error) code = RERR_FILEIO;
-
signal(SIGUSR1, SIG_IGN);
signal(SIGUSR2, SIG_IGN);
signal(SIGUSR1, SIG_IGN);
signal(SIGUSR2, SIG_IGN);
+ if (cleanup_child_pid != -1) {
+ int status;
+ if (waitpid(cleanup_child_pid, &status, WNOHANG) == cleanup_child_pid) {
+ status = WEXITSTATUS(status);
+ if (status > code) code = status;
+ }
+ }
+
if (cleanup_got_literal && cleanup_fname && keep_partial) {
char *fname = cleanup_fname;
cleanup_fname = NULL;
if (cleanup_got_literal && cleanup_fname && keep_partial) {
char *fname = cleanup_fname;
cleanup_fname = NULL;
@@
-68,14
+75,12
@@
void _exit_cleanup(int code, const char *file, int line)
}
}
}
}
- if (code) log_exit(code, file, line);
-
- if (code == 0) {
- if (log_got_error) {
- code = RERR_FILEIO;
- }
+ if (code == 0 && (io_error || log_got_error)) {
+ code = RERR_PARTIAL;
}
}
+ if (code) log_exit(code, file, line);
+
exit(code);
}
exit(code);
}