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
The new function setup_iconv() initializes the ic_chck var.
[rsync/rsync.git]
/
cleanup.c
diff --git
a/cleanup.c
b/cleanup.c
index
bb589e4
..
b952cff
100644
(file)
--- a/
cleanup.c
+++ b/
cleanup.c
@@
-26,6
+26,10
@@
extern int keep_partial;
extern int log_got_error;
extern char *partial_dir;
extern int log_got_error;
extern char *partial_dir;
+#ifdef HAVE_SIGACTION
+static struct sigaction sigact;
+#endif
+
/**
* Close all open sockets and files, allowing a (somewhat) graceful
* shutdown() of socket connections. This eliminates the abortive
/**
* Close all open sockets and files, allowing a (somewhat) graceful
* shutdown() of socket connections. This eliminates the abortive
@@
-94,8
+98,8
@@
void _exit_cleanup(int code, const char *file, int line)
}
inside_cleanup++;
}
inside_cleanup++;
-
signal
(SIGUSR1, SIG_IGN);
-
signal
(SIGUSR2, SIG_IGN);
+
SIGACTION
(SIGUSR1, SIG_IGN);
+
SIGACTION
(SIGUSR2, SIG_IGN);
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",
@@
-104,7
+108,8
@@
void _exit_cleanup(int code, const char *file, int line)
if (cleanup_child_pid != -1) {
int status;
if (cleanup_child_pid != -1) {
int status;
- if (waitpid(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;
status = WEXITSTATUS(status);
if (status > code)
code = status;
@@
-121,8
+126,8
@@
void _exit_cleanup(int code, const char *file, int line)
flush_write_file(cleanup_fd_w);
close(cleanup_fd_w);
}
flush_write_file(cleanup_fd_w);
close(cleanup_fd_w);
}
- finish_transfer(cleanup_new_fname, fname,
cleanup_file, 0
,
- !partial_dir);
+ finish_transfer(cleanup_new_fname, fname,
NULL
,
+
cleanup_file, 0,
!partial_dir);
}
io_flush(FULL_FLUSH);
if (cleanup_fname)
}
io_flush(FULL_FLUSH);
if (cleanup_fname)