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
Switched back to checking for iconv_open() due to HP-UX.
[rsync/rsync.git]
/
cleanup.c
diff --git
a/cleanup.c
b/cleanup.c
index
0316bf9
..
b952cff
100644
(file)
--- a/
cleanup.c
+++ b/
cleanup.c
@@
-24,6
+24,11
@@
extern int io_error;
extern int keep_partial;
extern int log_got_error;
extern int io_error;
extern int keep_partial;
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
/**
* Close all open sockets and files, allowing a (somewhat) graceful
@@
-36,12
+41,11
@@
void close_all(void)
int max_fd;
int fd;
int ret;
int max_fd;
int fd;
int ret;
-
struct stat
st;
+
STRUCT_STAT
st;
max_fd = sysconf(_SC_OPEN_MAX) - 1;
for (fd = max_fd; fd >= 0; fd--) {
max_fd = sysconf(_SC_OPEN_MAX) - 1;
for (fd = max_fd; fd >= 0; fd--) {
- ret = fstat(fd,&st);
- if (fstat(fd,&st) == 0) {
+ if ((ret = do_fstat(fd, &st)) == 0) {
if (is_a_socket(fd))
ret = shutdown(fd, 2);
ret = close(fd);
if (is_a_socket(fd))
ret = shutdown(fd, 2);
ret = close(fd);
@@
-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,21
+108,26
@@
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;
}
}
- if (cleanup_got_literal && cleanup_fname && keep_partial) {
+ if (cleanup_got_literal && cleanup_fname && keep_partial
+ && handle_partial_dir(cleanup_new_fname, PDIR_CREATE)) {
char *fname = cleanup_fname;
cleanup_fname = NULL;
if (cleanup_fd_r != -1)
close(cleanup_fd_r);
char *fname = cleanup_fname;
cleanup_fname = NULL;
if (cleanup_fd_r != -1)
close(cleanup_fd_r);
- if (cleanup_fd_w != -1)
+ if (cleanup_fd_w != -1) {
+ flush_write_file(cleanup_fd_w);
close(cleanup_fd_w);
close(cleanup_fd_w);
- finish_transfer(cleanup_new_fname, fname, cleanup_file, 0);
+ }
+ 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)
@@
-132,10
+141,12
@@
void _exit_cleanup(int code, const char *file, int line)
}
if (code == 0) {
}
if (code == 0) {
- if (
(io_error & ~IOERR_VANISHED) || log_got_error
)
- code = RERR_
PARTIAL
;
-
else if (io_error
)
+ if (
io_error & IOERR_DEL_LIMIT
)
+ code = RERR_
DEL_LIMIT
;
+
if (io_error & IOERR_VANISHED
)
code = RERR_VANISHED;
code = RERR_VANISHED;
+ if (io_error & IOERR_GENERAL || log_got_error)
+ code = RERR_PARTIAL;
}
if (code)
}
if (code)
@@
-160,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;