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
Matt's executability test with a few tweaks (e.g. to avoid using
[rsync/rsync.git]
/
cleanup.c
diff --git
a/cleanup.c
b/cleanup.c
index
78c048a
..
08609e1
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;
+#if defined HAVE_SIGACTION && defined HAVE_SIGPROCMASK
+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,17
+98,18
@@
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",
- code,
safe_fname(file)
, line);
+ code,
file
, 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)
@@
-149,7
+154,7
@@
void _exit_cleanup(int code, const char *file, int line)
if (verbose > 2) {
rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): about to call exit(%d)\n",
if (verbose > 2) {
rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): about to call exit(%d)\n",
- ocode,
safe_fname(file)
, line, code);
+ ocode,
file
, line, code);
}
close_all();
}
close_all();
@@
-166,7
+171,7
@@
void cleanup_disable(void)
void cleanup_set(char *fnametmp, char *fname, struct file_struct *file,
int fd_r, int fd_w)
{
void cleanup_set(char *fnametmp, char *fname, struct file_struct *file,
int fd_r, int fd_w)
{
- cleanup_fname = fname
tmp
;
+ cleanup_fname = fname
? fnametmp : NULL
;
cleanup_new_fname = fname;
cleanup_file = file;
cleanup_fd_r = fd_r;
cleanup_new_fname = fname;
cleanup_file = file;
cleanup_fd_r = fd_r;