Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
2dc7b91
)
- Fixed a bug in the passing of the --max-delete option.
author
Wayne Davison
<wayned@samba.org>
Sat, 15 Sep 2007 20:54:31 +0000
(20:54 +0000)
committer
Wayne Davison
<wayned@samba.org>
Sat, 15 Sep 2007 20:54:31 +0000
(20:54 +0000)
- Added --no-i-d as a shorter no-implied-dirs.
- Changing to --no-i-r instead of --no-ir.
options.c
patch
|
blob
|
blame
|
history
diff --git
a/options.c
b/options.c
index
b6eab10
..
9b1d4c4
100644
(file)
--- a/
options.c
+++ b/
options.c
@@
-461,8
+461,9
@@
static struct poptOption long_options[] = {
{"no-r", 0, POPT_ARG_VAL, &recurse, 0, 0, 0 },
{"inc-recursive", 0, POPT_ARG_VAL, &allow_inc_recurse, 1, 0, 0 },
{"no-inc-recursive", 0, POPT_ARG_VAL, &allow_inc_recurse, 0, 0, 0 },
{"no-r", 0, POPT_ARG_VAL, &recurse, 0, 0, 0 },
{"inc-recursive", 0, POPT_ARG_VAL, &allow_inc_recurse, 1, 0, 0 },
{"no-inc-recursive", 0, POPT_ARG_VAL, &allow_inc_recurse, 0, 0, 0 },
- {"ir", 0, POPT_ARG_VAL, &allow_inc_recurse, 1, 0, 0 },
- {"no-ir", 0, POPT_ARG_VAL, &allow_inc_recurse, 0, 0, 0 },
+ {"i-r", 0, POPT_ARG_VAL, &allow_inc_recurse, 1, 0, 0 },
+ {"no-i-r", 0, POPT_ARG_VAL, &allow_inc_recurse, 0, 0, 0 },
+ {"no-ir", 0, POPT_ARG_VAL, &allow_inc_recurse, 0, 0, 0 }, /* XXX remove soon */
{"dirs", 'd', POPT_ARG_VAL, &xfer_dirs, 2, 0, 0 },
{"no-dirs", 0, POPT_ARG_VAL, &xfer_dirs, 0, 0, 0 },
{"no-d", 0, POPT_ARG_VAL, &xfer_dirs, 0, 0, 0 },
{"dirs", 'd', POPT_ARG_VAL, &xfer_dirs, 2, 0, 0 },
{"no-dirs", 0, POPT_ARG_VAL, &xfer_dirs, 0, 0, 0 },
{"no-d", 0, POPT_ARG_VAL, &xfer_dirs, 0, 0, 0 },
@@
-514,6
+515,8
@@
static struct poptOption long_options[] = {
{"no-R", 0, POPT_ARG_VAL, &relative_paths, 0, 0, 0 },
{"implied-dirs", 0, POPT_ARG_VAL, &implied_dirs, 1, 0, 0 },
{"no-implied-dirs", 0, POPT_ARG_VAL, &implied_dirs, 0, 0, 0 },
{"no-R", 0, POPT_ARG_VAL, &relative_paths, 0, 0, 0 },
{"implied-dirs", 0, POPT_ARG_VAL, &implied_dirs, 1, 0, 0 },
{"no-implied-dirs", 0, POPT_ARG_VAL, &implied_dirs, 0, 0, 0 },
+ {"i-d", 0, POPT_ARG_VAL, &implied_dirs, 1, 0, 0 },
+ {"no-i-d", 0, POPT_ARG_VAL, &implied_dirs, 0, 0, 0 },
{"chmod", 0, POPT_ARG_STRING, 0, OPT_CHMOD, 0, 0 },
{"ignore-times", 'I', POPT_ARG_NONE, &ignore_times, 0, 0, 0 },
{"size-only", 0, POPT_ARG_NONE, &size_only, 0, 0, 0 },
{"chmod", 0, POPT_ARG_STRING, 0, OPT_CHMOD, 0, 0 },
{"ignore-times", 'I', POPT_ARG_NONE, &ignore_times, 0, 0, 0 },
{"size-only", 0, POPT_ARG_NONE, &size_only, 0, 0, 0 },
@@
-1847,7
+1850,7
@@
void server_options(char **args, int *argc_p)
goto oom;
args[ac++] = arg;
} else if (max_delete == 0)
goto oom;
args[ac++] = arg;
} else if (max_delete == 0)
- args[ac++] = "--max
_
delete=-1";
+ args[ac++] = "--max
-
delete=-1";
if (min_size) {
args[ac++] = "--min-size";
args[ac++] = min_size_arg;
if (min_size) {
args[ac++] = "--min-size";
args[ac++] = min_size_arg;
@@
-1919,7
+1922,7
@@
void server_options(char **args, int *argc_p)
args[ac++] = "--numeric-ids";
if (!allow_inc_recurse)
args[ac++] = "--numeric-ids";
if (!allow_inc_recurse)
- args[ac++] = "--no-ir";
+ args[ac++] = "--no-ir";
/* XXX change to --no-i-r soon */
if (am_sender) {
if (ignore_existing)
if (am_sender) {
if (ignore_existing)