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
Fixed the code that removes old file versions for a final release.
[rsync/rsync.git]
/
cleanup.c
diff --git
a/cleanup.c
b/cleanup.c
index
a6a9023
..
e59565d
100644
(file)
--- a/
cleanup.c
+++ b/
cleanup.c
@@
-4,7
+4,7
@@
* Copyright (C) 1996-2000 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
* Copyright (C) 2002 Martin Pool
* Copyright (C) 1996-2000 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
* Copyright (C) 2002 Martin Pool
- * Copyright (C) 2003-200
7
Wayne Davison
+ * Copyright (C) 2003-200
8
Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-26,7
+26,7
@@
extern int am_server;
extern int am_daemon;
extern int io_error;
extern int keep_partial;
extern int am_daemon;
extern int io_error;
extern int keep_partial;
-extern int
log_got
_error;
+extern int
got_xfer
_error;
extern char *partial_dir;
extern char *logfile_name;
extern char *partial_dir;
extern char *logfile_name;
@@
-78,8
+78,8
@@
void close_all(void)
**/
int cleanup_got_literal = 0;
**/
int cleanup_got_literal = 0;
-static char *cleanup_fname;
-static char *cleanup_new_fname;
+static c
onst c
har *cleanup_fname;
+static c
onst c
har *cleanup_new_fname;
static struct file_struct *cleanup_file;
static int cleanup_fd_r, cleanup_fd_w;
static pid_t cleanup_pid = 0;
static struct file_struct *cleanup_file;
static int cleanup_fd_r, cleanup_fd_w;
static pid_t cleanup_pid = 0;
@@
-139,7
+139,7
@@
NORETURN void _exit_cleanup(int code, const char *file, int line)
if (cleanup_got_literal && cleanup_fname && cleanup_new_fname
&& keep_partial && handle_partial_dir(cleanup_new_fname, PDIR_CREATE)) {
if (cleanup_got_literal && cleanup_fname && cleanup_new_fname
&& keep_partial && handle_partial_dir(cleanup_new_fname, PDIR_CREATE)) {
- char *fname = cleanup_fname;
+ c
onst c
har *fname = cleanup_fname;
cleanup_fname = NULL;
if (cleanup_fd_r != -1)
close(cleanup_fd_r);
cleanup_fname = NULL;
if (cleanup_fd_r != -1)
close(cleanup_fd_r);
@@
-174,7
+174,7
@@
NORETURN void _exit_cleanup(int code, const char *file, int line)
code = exit_code = RERR_DEL_LIMIT;
if (io_error & IOERR_VANISHED)
code = exit_code = RERR_VANISHED;
code = exit_code = RERR_DEL_LIMIT;
if (io_error & IOERR_VANISHED)
code = exit_code = RERR_VANISHED;
- if (io_error & IOERR_GENERAL ||
log_got
_error)
+ if (io_error & IOERR_GENERAL ||
got_xfer
_error)
code = exit_code = RERR_PARTIAL;
}
code = exit_code = RERR_PARTIAL;
}
@@
-213,7
+213,7
@@
void cleanup_disable(void)
}
}
-void cleanup_set(c
har *fnametmp,
char *fname, struct file_struct *file,
+void cleanup_set(c
onst char *fnametmp, const
char *fname, struct file_struct *file,
int fd_r, int fd_w)
{
cleanup_fname = fnametmp;
int fd_r, int fd_w)
{
cleanup_fname = fnametmp;