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
Added hashtable.o.
[rsync/rsync.git]
/
cleanup.c
diff --git
a/cleanup.c
b/cleanup.c
index
df8c95b
..
d35d77a
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
-2007
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"
@@
-107,8
+106,7
@@
NORETURN void _exit_cleanup(int code, const char *file, int line)
/* 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;
@@
-119,8
+117,7
@@
NORETURN void _exit_cleanup(int code, const char *file, int line)
}
/* FALLTHROUGH */
}
/* FALLTHROUGH */
- case 1:
- cleanup_step++;
+#include "case_N.h"
if (cleanup_child_pid != -1) {
int status;
if (cleanup_child_pid != -1) {
int status;
@@
-133,8
+130,7
@@
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)) {
@@
-146,19
+142,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);
@@
-183,8
+177,7
@@
NORETURN void _exit_cleanup(int code, const char *file, int line)
log_exit(code, file, line);
/* FALLTHROUGH */
log_exit(code, file, line);
/* FALLTHROUGH */
- case 5:
- cleanup_step++;
+#include "case_N.h"
if (verbose > 2) {
rprintf(FINFO,
if (verbose > 2) {
rprintf(FINFO,
@@
-194,9
+187,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 */