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
Improved the argv/argc variable names that are really pointers.
[rsync/rsync.git]
/
options.c
diff --git
a/options.c
b/options.c
index
241d075
..
4419782
100644
(file)
--- a/
options.c
+++ b/
options.c
@@
-856,12
+856,13
@@
static void create_refuse_error(int which)
*
* @retval 0 on error, with err_buf containing an explanation
**/
*
* @retval 0 on error, with err_buf containing an explanation
**/
-int parse_arguments(int *argc
, const char ***argv
, int frommain)
+int parse_arguments(int *argc
_p, const char ***argv_p
, int frommain)
{
{
- int opt;
- char *ref = lp_refuse_options(module_id);
- const char *arg;
poptContext pc;
poptContext pc;
+ char *ref = lp_refuse_options(module_id);
+ const char *arg, **argv = *argv_p;
+ int argc = *argc_p;
+ int opt;
if (ref && *ref)
set_refuse_options(ref);
if (ref && *ref)
set_refuse_options(ref);
@@
-894,7
+895,7
@@
int parse_arguments(int *argc, const char ***argv, int frommain)
/* Disable popt aliases on the server side and
* then start parsing the options again. */
poptFreeContext(pc);
/* Disable popt aliases on the server side and
* then start parsing the options again. */
poptFreeContext(pc);
- pc = poptGetContext(RSYNC_NAME,
*argc, *
argv,
+ pc = poptGetContext(RSYNC_NAME,
argc,
argv,
long_options, 0);
am_server = 1;
}
long_options, 0);
am_server = 1;
}
@@
-922,7
+923,7
@@
int parse_arguments(int *argc, const char ***argv, int frommain)
iconv_opt = NULL;
#endif
poptFreeContext(pc);
iconv_opt = NULL;
#endif
poptFreeContext(pc);
- pc = poptGetContext(RSYNC_NAME,
*argc, *
argv,
+ pc = poptGetContext(RSYNC_NAME,
argc,
argv,
long_daemon_options, 0);
while ((opt = poptGetNextOpt(pc)) != -1) {
switch (opt) {
long_daemon_options, 0);
while ((opt = poptGetNextOpt(pc)) != -1) {
switch (opt) {
@@
-957,8
+958,8
@@
int parse_arguments(int *argc, const char ***argv, int frommain)
exit_cleanup(RERR_SYNTAX);
}
exit_cleanup(RERR_SYNTAX);
}
- *argv = poptGetArgs(pc);
- *argc
= count_args(*
argv);
+ *argv
_p = argv
= poptGetArgs(pc);
+ *argc
_p = argc = count_args(
argv);
am_starting_up = 0;
daemon_opt = 0;
am_daemon = 1;
am_starting_up = 0;
daemon_opt = 0;
am_daemon = 1;
@@
-1222,7
+1223,7
@@
int parse_arguments(int *argc, const char ***argv, int frommain)
}
}
}
}
- if (human_readable &&
*
argc == 2) {
+ if (human_readable && argc == 2) {
/* Allow the old meaning of 'h' (--help) on its own. */
usage(FINFO);
exit_cleanup(0);
/* Allow the old meaning of 'h' (--help) on its own. */
usage(FINFO);
exit_cleanup(0);
@@
-1367,13
+1368,13
@@
int parse_arguments(int *argc, const char ***argv, int frommain)
need_messages_from_generator = 1;
}
need_messages_from_generator = 1;
}
- *argv = poptGetArgs(pc);
- *argc
= count_args(*
argv);
+ *argv
_p = argv
= poptGetArgs(pc);
+ *argc
_p = argc = count_args(
argv);
if (sanitize_paths) {
int i;
if (sanitize_paths) {
int i;
- for (i =
*
argc; i-- > 0; )
-
(*argv)[i] = sanitize_path(NULL, (*argv)
[i], "", 0, NULL);
+ for (i = argc; i-- > 0; )
+
argv[i] = sanitize_path(NULL, argv
[i], "", 0, NULL);
if (tmpdir)
tmpdir = sanitize_path(NULL, tmpdir, NULL, 0, NULL);
if (backup_dir)
if (tmpdir)
tmpdir = sanitize_path(NULL, tmpdir, NULL, 0, NULL);
if (backup_dir)
@@
-1397,9
+1398,6
@@
int parse_arguments(int *argc, const char ***argv, int frommain)
}
}
}
}
- if (omit_dir_times && preserve_times > 1)
- preserve_times = 1;
-
if (!backup_suffix)
backup_suffix = backup_dir ? "" : BACKUP_SUFFIX;
backup_suffix_len = strlen(backup_suffix);
if (!backup_suffix)
backup_suffix = backup_dir ? "" : BACKUP_SUFFIX;
backup_suffix_len = strlen(backup_suffix);
@@
-1432,8
+1430,15
@@
int parse_arguments(int *argc, const char ***argv, int frommain)
"P *%s", backup_suffix);
parse_rule(&filter_list, backup_dir_buf, 0, 0);
}
"P *%s", backup_suffix);
parse_rule(&filter_list, backup_dir_buf, 0, 0);
}
- if (make_backups && !backup_dir && preserve_times > 1)
- preserve_times = 1;
+
+ if (make_backups && !backup_dir) {
+ omit_dir_times = 0; /* Implied, so avoid -O to sender. */
+ if (preserve_times > 1)
+ preserve_times = 1;
+ } else if (omit_dir_times) {
+ if (preserve_times > 1)
+ preserve_times = 1;
+ }
if (stdout_format) {
if (am_server && log_format_has(stdout_format, 'I'))
if (stdout_format) {
if (am_server && log_format_has(stdout_format, 'I'))
@@
-1554,7
+1559,7
@@
int parse_arguments(int *argc, const char ***argv, int frommain)
if (files_from) {
char *h, *p;
int q;
if (files_from) {
char *h, *p;
int q;
- if (
*argc > 2 || (!am_daemon && *
argc == 1)) {
+ if (
argc > 2 || (!am_daemon &&
argc == 1)) {
usage(FERROR);
exit_cleanup(RERR_SYNTAX);
}
usage(FERROR);
exit_cleanup(RERR_SYNTAX);
}
@@
-1614,10
+1619,10
@@
int parse_arguments(int *argc, const char ***argv, int frommain)
* behave, and also filtering out options that are processed only
* locally.
**/
* behave, and also filtering out options that are processed only
* locally.
**/
-void server_options(char **args,
int *argc
)
+void server_options(char **args,
int *argc_p
)
{
static char argstr[64];
{
static char argstr[64];
- int ac = *argc;
+ int ac = *argc
_p
;
char *arg;
int i, x;
char *arg;
int i, x;
@@
-1630,7
+1635,7
@@
void server_options(char **args,int *argc)
if (daemon_over_rsh > 0) {
args[ac++] = "--daemon";
if (daemon_over_rsh > 0) {
args[ac++] = "--daemon";
- *argc = ac;
+ *argc
_p
= ac;
/* if we're passing --daemon, we're done */
return;
}
/* if we're passing --daemon, we're done */
return;
}
@@
-1958,7
+1963,7
@@
void server_options(char **args,int *argc)
else if (remove_source_files)
args[ac++] = "--remove-sent-files";
else if (remove_source_files)
args[ac++] = "--remove-sent-files";
- *argc = ac;
+ *argc
_p
= ac;
return;
oom:
return;
oom: