extern int sanitize_paths;
extern int select_timeout;
-extern struct exclude_list_struct exclude_list;
-extern struct exclude_list_struct server_exclude_list;
+extern struct filter_list_struct filter_list;
+extern struct filter_list_struct server_filter_list;
int make_backups = 0;
int blocking_io = -1;
int checksum_seed = 0;
int inplace = 0;
+int delay_updates = 0;
long block_size = 0; /* "long" because popt can't set an int32. */
rprintf(f, "%s version %s protocol version %d\n",
RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION);
rprintf(f,
- "Copyright (C) 1996-2004 by Andrew Tridgell and others\n");
+ "Copyright (C) 1996-2005 by Andrew Tridgell and others\n");
rprintf(f, "<http://rsync.samba.org/>\n");
rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, "
"%shard links, %ssymlinks, batchfiles, \n",
rprintf(F," --max-size=SIZE don't transfer any file larger than SIZE\n");
rprintf(F," --partial keep partially transferred files\n");
rprintf(F," --partial-dir=DIR put a partially transferred file into DIR\n");
+ rprintf(F," --delay-updates update all transferred files into place at end\n");
rprintf(F," --numeric-ids don't map uid/gid values by user/group name\n");
rprintf(F," --timeout=TIME set I/O timeout in seconds\n");
rprintf(F," -I, --ignore-times turn off mod time & file size quick check\n");
{"progress", 0, POPT_ARG_NONE, &do_progress, 0, 0, 0 },
{"partial", 0, POPT_ARG_NONE, &keep_partial, 0, 0, 0 },
{"partial-dir", 0, POPT_ARG_STRING, &partial_dir, 0, 0, 0 },
+ {"delay-updates", 0, POPT_ARG_NONE, &delay_updates, 0, 0, 0 },
{"ignore-errors", 0, POPT_ARG_NONE, &ignore_errors, 0, 0, 0 },
{"blocking-io", 0, POPT_ARG_VAL, &blocking_io, 1, 0, 0 },
{"no-blocking-io", 0, POPT_ARG_VAL, &blocking_io, 0, 0, 0 },
break;
case OPT_FILTER:
- add_exclude(&exclude_list, poptGetOptArg(pc), 0);
+ add_filter(&filter_list, poptGetOptArg(pc), 0);
break;
case OPT_EXCLUDE:
- add_exclude(&exclude_list, poptGetOptArg(pc),
- XFLG_DEF_EXCLUDE);
+ add_filter(&filter_list, poptGetOptArg(pc),
+ XFLG_DEF_EXCLUDE);
break;
case OPT_INCLUDE:
- add_exclude(&exclude_list, poptGetOptArg(pc),
- XFLG_DEF_INCLUDE);
+ add_filter(&filter_list, poptGetOptArg(pc),
+ XFLG_DEF_INCLUDE);
break;
case OPT_EXCLUDE_FROM:
arg = poptGetOptArg(pc);
if (sanitize_paths)
arg = sanitize_path(NULL, arg, NULL, 0);
- if (server_exclude_list.head) {
+ if (server_filter_list.head) {
char *cp = (char *)arg;
clean_fname(cp, 1);
- if (check_exclude(&server_exclude_list, cp, 0) < 0)
+ if (check_filter(&server_filter_list, cp, 0) < 0)
goto options_rejected;
}
- add_exclude_file(&exclude_list, arg, XFLG_FATAL_ERRORS
+ add_filter_file(&filter_list, arg, XFLG_FATAL_ERRORS
| (opt == OPT_INCLUDE_FROM ? XFLG_DEF_INCLUDE
: XFLG_DEF_EXCLUDE));
break;
case 'F':
switch (++F_option_cnt) {
case 1:
- add_exclude(&exclude_list,
+ add_filter(&filter_list,
": /.rsync-filter", 0);
break;
case 2:
- add_exclude(&exclude_list,
+ add_filter(&filter_list,
"- .rsync-filter", 0);
break;
}
if (files_from)
files_from = sanitize_path(NULL, files_from, NULL, 0);
}
- if (server_exclude_list.head && !am_sender) {
- struct exclude_list_struct *elp = &server_exclude_list;
+ if (server_filter_list.head && !am_sender) {
+ struct filter_list_struct *elp = &server_filter_list;
int i;
if (tmpdir) {
clean_fname(tmpdir, 1);
- if (check_exclude(elp, tmpdir, 1) < 0)
+ if (check_filter(elp, tmpdir, 1) < 0)
goto options_rejected;
}
if (partial_dir) {
clean_fname(partial_dir, 1);
- if (check_exclude(elp, partial_dir, 1) < 0)
+ if (check_filter(elp, partial_dir, 1) < 0)
goto options_rejected;
}
for (i = 0; i < basis_dir_cnt; i++) {
clean_fname(basis_dir[i], 1);
- if (check_exclude(elp, basis_dir[i], 1) < 0)
+ if (check_filter(elp, basis_dir[i], 1) < 0)
goto options_rejected;
}
if (backup_dir) {
clean_fname(backup_dir, 1);
- if (check_exclude(elp, backup_dir, 1) < 0)
+ if (check_filter(elp, backup_dir, 1) < 0)
goto options_rejected;
}
}
- if (server_exclude_list.head && files_from) {
+ if (server_filter_list.head && files_from) {
clean_fname(files_from, 1);
- if (check_exclude(&server_exclude_list, files_from, 0) < 0) {
+ if (check_filter(&server_filter_list, files_from, 0) < 0) {
options_rejected:
snprintf(err_buf, sizeof err_buf,
"Your options have been rejected by the server.\n");
bwlimit_writemax = 512;
}
+ if (delay_updates && !partial_dir)
+ partial_dir = ".~tmp~";
+
if (inplace) {
#if HAVE_FTRUNCATE
if (partial_dir) {
snprintf(err_buf, sizeof err_buf,
- "--inplace cannot be used with --partial-dir\n");
+ "--inplace cannot be used with --%s\n",
+ delay_updates ? "delay-updates" : "partial-dir");
return 0;
}
keep_partial = 0;
if (!*partial_dir || strcmp(partial_dir, ".") == 0)
partial_dir = NULL;
else if (*partial_dir != '/') {
- add_exclude(&exclude_list, partial_dir,
+ add_filter(&filter_list, partial_dir,
XFLG_DIRECTORY | XFLG_DEF_EXCLUDE);
}
keep_partial = 1;
if (partial_dir && am_sender) {
args[ac++] = "--partial-dir";
args[ac++] = partial_dir;
+ if (delay_updates)
+ args[ac++] = "--delay-updates";
} else if (keep_partial)
args[ac++] = "--partial";