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
Apply sanitize_paths() to glob expansions when use chroot = no.
[rsync/rsync.git]
/
cleanup.c
diff --git
a/cleanup.c
b/cleanup.c
index
05f3452
..
be79503
100644
(file)
--- a/
cleanup.c
+++ b/
cleanup.c
@@
-27,8
+27,11
@@
int cleanup_got_literal=0;
static char *cleanup_fname;
static char *cleanup_new_fname;
static struct file_struct *cleanup_file;
static char *cleanup_fname;
static char *cleanup_new_fname;
static struct file_struct *cleanup_file;
+static int cleanup_fd1, cleanup_fd2;
+static struct map_struct *cleanup_buf;
+static int cleanup_pid = 0;
-void
exit_cleanup(int cod
e)
+void
_exit_cleanup(int code, const char *file, int lin
e)
{
extern int keep_partial;
{
extern int keep_partial;
@@
-37,6
+40,9
@@
void exit_cleanup(int code)
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;
+ if (cleanup_buf) unmap_file(cleanup_buf);
+ if (cleanup_fd1 != -1) close(cleanup_fd1);
+ if (cleanup_fd2 != -1) close(cleanup_fd2);
finish_transfer(cleanup_new_fname, fname, cleanup_file);
}
io_flush();
finish_transfer(cleanup_new_fname, fname, cleanup_file);
}
io_flush();
@@
-45,6
+51,15
@@
void exit_cleanup(int code)
if (code) {
kill_all(SIGUSR1);
}
if (code) {
kill_all(SIGUSR1);
}
+ if ((cleanup_pid != 0) && (cleanup_pid == (int) getpid())) {
+ char *pidf = lp_pid_file();
+ if (pidf && *pidf) {
+ unlink(lp_pid_file());
+ }
+ }
+
+ if (code) log_exit(code, file, line);
+
exit(code);
}
exit(code);
}
@@
-55,9
+70,18
@@
void cleanup_disable(void)
}
}
-void cleanup_set(char *fnametmp, char *fname, struct file_struct *file)
+void cleanup_set(char *fnametmp, char *fname, struct file_struct *file,
+ struct map_struct *buf, int fd1, int fd2)
{
cleanup_fname = fnametmp;
cleanup_new_fname = fname;
cleanup_file = file;
{
cleanup_fname = fnametmp;
cleanup_new_fname = fname;
cleanup_file = file;
+ cleanup_buf = buf;
+ cleanup_fd1 = fd1;
+ cleanup_fd2 = fd2;
+}
+
+void cleanup_set_pid(int pid)
+{
+ cleanup_pid = pid;
}
}