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 (parent:
0a39837
)
The "recurse" value is back to being just 1 or 0 (true or false).
author
Wayne Davison
<wayned@samba.org>
Mon, 14 Mar 2005 17:30:13 +0000
(17:30 +0000)
committer
Wayne Davison
<wayned@samba.org>
Mon, 14 Mar 2005 17:30:13 +0000
(17:30 +0000)
options.c
patch
|
blob
|
blame
|
history
diff --git
a/options.c
b/options.c
index
cb9bbaf
..
a9f4c2d
100644
(file)
--- a/
options.c
+++ b/
options.c
@@
-415,7
+415,7
@@
static struct poptOption long_options[] = {
{"archive", 'a', POPT_ARG_NONE, &archive_mode, 0, 0, 0 },
{"server", 0, POPT_ARG_NONE, &am_server, 0, 0, 0 },
{"sender", 0, POPT_ARG_NONE, 0, OPT_SENDER, 0, 0 },
{"archive", 'a', POPT_ARG_NONE, &archive_mode, 0, 0, 0 },
{"server", 0, POPT_ARG_NONE, &am_server, 0, 0, 0 },
{"sender", 0, POPT_ARG_NONE, 0, OPT_SENDER, 0, 0 },
- {"recursive", 'r', POPT_ARG_
VAL, &recurse, -1
, 0, 0 },
+ {"recursive", 'r', POPT_ARG_
NONE, &recurse, 0
, 0, 0 },
{"list-only", 0, POPT_ARG_VAL, &list_only, 2, 0, 0 },
{"relative", 'R', POPT_ARG_VAL, &relative_paths, 1, 0, 0 },
{"no-relative", 0, POPT_ARG_VAL, &relative_paths, 0, 0, 0 },
{"list-only", 0, POPT_ARG_VAL, &list_only, 2, 0, 0 },
{"relative", 'R', POPT_ARG_VAL, &relative_paths, 1, 0, 0 },
{"no-relative", 0, POPT_ARG_VAL, &relative_paths, 0, 0, 0 },
@@
-948,7
+948,7
@@
int parse_arguments(int *argc, const char ***argv, int frommain)
return 0;
}
if (!files_from)
return 0;
}
if (!files_from)
- recurse =
-1; /* infinite recursion */
+ recurse =
1;
#ifdef SUPPORT_LINKS
preserve_links = 1;
#endif
#ifdef SUPPORT_LINKS
preserve_links = 1;
#endif
@@
-1281,7
+1281,7
@@
void server_options(char **args,int *argc)
argstr[x++] = 'O';
if (preserve_perms)
argstr[x++] = 'p';
argstr[x++] = 'O';
if (preserve_perms)
argstr[x++] = 'p';
- if (recurse
< 0
)
+ if (recurse)
argstr[x++] = 'r';
if (always_checksum)
argstr[x++] = 'c';
argstr[x++] = 'r';
if (always_checksum)
argstr[x++] = 'c';
@@
-1301,7
+1301,7
@@
void server_options(char **args,int *argc)
/* This is a complete hack - blame Rusty. FIXME!
* This hack is only needed for older rsync versions that
* don't understand the --list-only option. */
/* This is a complete hack - blame Rusty. FIXME!
* This hack is only needed for older rsync versions that
* don't understand the --list-only option. */
- if (list_only == 1 && recurse
>= 0
)
+ if (list_only == 1 && recurse)
argstr[x++] = 'r';
argstr[x] = 0;
argstr[x++] = 'r';
argstr[x] = 0;