mirror/rsync
1
0 Fork 0
mirror of https://github.com/RsyncProject/rsync.git synced 2026-10-21 21:34:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

- When exiting, set the flag "in_exit_cleanup".

Browse Source 
- Mark _exit_cleanup() with NORETURN.
- Don't ever return from _exit_cleanup().
This commit is contained in:
Wayne Davison committed 2006-10-13 07:38:15 +00:00
1 parent 33394b769d
commit b1b54199ef
1 file changed
+6 -10
Download Patch File Download Diff File Expand all files Collapse all files
cleanup.c
+6 -10
View File
@@ -87,25 +87,22 @@ static pid_t cleanup_pid = 0;
pid_t cleanup_child_pid = -1;
int in_exit_cleanup = 0;
/**
* Eventually calls exit(), passing @p code, therefore does not return.
*
* @param code one of the RERR_* codes from errcode.h.
**/
void _exit_cleanup(int code, const char *file, int line)
NORETURN void _exit_cleanup(int code, const char *file, int line)
{
int ocode = code;
static int inside_cleanup = 0;
if (inside_cleanup > 10) {
/* prevent the occasional infinite recursion */
return;
}
inside_cleanup++;
SIGACTION(SIGUSR1, SIG_IGN);
SIGACTION(SIGUSR2, SIG_IGN);
in_exit_cleanup = 1;
if (verbose > 3) {
rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): entered\n",
code, file, line);
@@ -113,8 +110,7 @@ void _exit_cleanup(int code, const char *file, int line)
if (cleanup_child_pid != -1) {
int status;
if (wait_process(cleanup_child_pid, &status, WNOHANG)
== cleanup_child_pid) {
if (wait_process(cleanup_child_pid, &status, WNOHANG) == cleanup_child_pid) {
status = WEXITSTATUS(status);
if (status > code)
code = status;