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
Support for ": dirconf/per-dir-rules", in progress.
[rsync/rsync.git]
/
cleanup.c
diff --git
a/cleanup.c
b/cleanup.c
index
df8c95b
..
22e2e35
100644
(file)
--- a/
cleanup.c
+++ b/
cleanup.c
@@
-4,11
+4,11
@@
* 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
, 2004, 2005, 2006
Wayne Davison
+ * Copyright (C) 2003
-2008
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
- * the Free Software Foundation; either version
2
of the License, or
+ * the Free Software Foundation; either version
3
of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@
-17,8
+17,7
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ * with this program; if not, visit the http://fsf.org website.
*/
#include "rsync.h"
*/
#include "rsync.h"
@@
-27,7
+26,8
@@
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 int output_needs_newline;
extern char *partial_dir;
extern char *logfile_name;
extern char *partial_dir;
extern char *logfile_name;
@@
-79,8
+79,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;
@@
-104,23
+104,31
@@
NORETURN void _exit_cleanup(int code, const char *file, int line)
if (exit_code) /* Preserve first error code when recursing. */
code = exit_code;
if (exit_code) /* Preserve first error code when recursing. */
code = exit_code;
+ /* If this is the exit at the end of the run, the server side
+ * should not attempt to output a message (see log_exit()). */
+ if (am_server && code == 0)
+ am_server = 2;
+
/* Some of our actions might cause a recursive call back here, so we
* keep track of where we are in the cleanup and never repeat a step. */
switch (cleanup_step) {
/* Some of our actions might cause a recursive call back here, so we
* keep track of where we are in the cleanup and never repeat a step. */
switch (cleanup_step) {
- case 0:
- cleanup_step++;
+#include "case_N.h" /* case 0: cleanup_step++; */
exit_code = unmodified_code = code;
exit_code = unmodified_code = code;
- if (verbose > 3) {
+ if (output_needs_newline) {
+ fputc('\n', stdout);
+ output_needs_newline = 0;
+ }
+
+ if (DEBUG_GTE(EXIT, 2)) {
rprintf(FINFO,
"_exit_cleanup(code=%d, file=%s, line=%d): entered\n",
code, file, line);
}
/* FALLTHROUGH */
rprintf(FINFO,
"_exit_cleanup(code=%d, file=%s, line=%d): entered\n",
code, file, line);
}
/* FALLTHROUGH */
- case 1:
- cleanup_step++;
+#include "case_N.h"
if (cleanup_child_pid != -1) {
int status;
if (cleanup_child_pid != -1) {
int status;
@@
-133,12
+141,11
@@
NORETURN void _exit_cleanup(int code, const char *file, int line)
}
/* FALLTHROUGH */
}
/* FALLTHROUGH */
- case 2:
- cleanup_step++;
+#include "case_N.h"
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);
@@
-146,19
+153,17
@@
NORETURN 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, NULL,
+ finish_transfer(cleanup_new_fname, fname, NULL,
NULL,
cleanup_file, 0, !partial_dir);
}
/* FALLTHROUGH */
cleanup_file, 0, !partial_dir);
}
/* FALLTHROUGH */
- case 3:
- cleanup_step++;
+#include "case_N.h"
io_flush(FULL_FLUSH);
/* FALLTHROUGH */
io_flush(FULL_FLUSH);
/* FALLTHROUGH */
- case 4:
- cleanup_step++;
+#include "case_N.h"
if (cleanup_fname)
do_unlink(cleanup_fname);
if (cleanup_fname)
do_unlink(cleanup_fname);
@@
-175,18
+180,17
@@
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;
}
- if (code || am_daemon || (logfile_name && (am_server || !
verbose
)))
+ if (code || am_daemon || (logfile_name && (am_server || !
INFO_GTE(STATS, 1)
)))
log_exit(code, file, line);
/* FALLTHROUGH */
log_exit(code, file, line);
/* FALLTHROUGH */
- case 5:
- cleanup_step++;
+#include "case_N.h"
- if (
verbose > 2
) {
+ if (
DEBUG_GTE(EXIT, 1)
) {
rprintf(FINFO,
"_exit_cleanup(code=%d, file=%s, line=%d): "
"about to call exit(%d)\n",
rprintf(FINFO,
"_exit_cleanup(code=%d, file=%s, line=%d): "
"about to call exit(%d)\n",
@@
-194,9
+198,10
@@
NORETURN void _exit_cleanup(int code, const char *file, int line)
}
/* FALLTHROUGH */
}
/* FALLTHROUGH */
- case 6:
- cleanup_step++;
+#include "case_N.h"
+ if (am_server && code)
+ msleep(100);
close_all();
/* FALLTHROUGH */
close_all();
/* FALLTHROUGH */
@@
-214,7
+219,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;