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
Fixed some typos that Matt pointed out.
[rsync/rsync.git]
/
options.c
diff --git
a/options.c
b/options.c
index
e4fe5bd
..
940d53a
100644
(file)
--- a/
options.c
+++ b/
options.c
@@
-421,7
+421,7
@@
void usage(enum logcode F)
rprintf(F," --read-batch=FILE read a batched update from FILE\n");
rprintf(F," --protocol=NUM force an older protocol version to be used\n");
#ifdef ICONV_OPTION
rprintf(F," --read-batch=FILE read a batched update from FILE\n");
rprintf(F," --protocol=NUM force an older protocol version to be used\n");
#ifdef ICONV_OPTION
- rprintf(F," --iconv=CONVERT_SPEC request charset conversion of file
s
names\n");
+ rprintf(F," --iconv=CONVERT_SPEC request charset conversion of filenames\n");
#endif
rprintf(F," -4, --ipv4 prefer IPv4\n");
rprintf(F," -6, --ipv6 prefer IPv6\n");
#endif
rprintf(F," -4, --ipv4 prefer IPv4\n");
rprintf(F," -6, --ipv6 prefer IPv6\n");
@@
-1009,7
+1009,7
@@
int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
out_of_memory("parse_arguments");
if (!*cp)
goto options_rejected;
out_of_memory("parse_arguments");
if (!*cp)
goto options_rejected;
- clean_fname(cp,
1
);
+ clean_fname(cp,
CFN_COLLAPSE_DOT_DOT_DIRS
);
rej = check_filter(&server_filter_list, cp, 0) < 0;
free(cp);
if (rej)
rej = check_filter(&server_filter_list, cp, 0) < 0;
free(cp);
if (rej)
@@
-1405,14
+1405,14
@@
int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
if (tmpdir) {
if (!*tmpdir)
goto options_rejected;
if (tmpdir) {
if (!*tmpdir)
goto options_rejected;
- clean_fname(tmpdir,
1
);
+ clean_fname(tmpdir,
CFN_COLLAPSE_DOT_DOT_DIRS
);
if (check_filter(elp, tmpdir, 1) < 0)
goto options_rejected;
}
if (backup_dir) {
if (!*backup_dir)
goto options_rejected;
if (check_filter(elp, tmpdir, 1) < 0)
goto options_rejected;
}
if (backup_dir) {
if (!*backup_dir)
goto options_rejected;
- clean_fname(backup_dir,
1
);
+ clean_fname(backup_dir,
CFN_COLLAPSE_DOT_DOT_DIRS
);
if (check_filter(elp, backup_dir, 1) < 0)
goto options_rejected;
}
if (check_filter(elp, backup_dir, 1) < 0)
goto options_rejected;
}
@@
-1565,7
+1565,7
@@
int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
}
if (partial_dir) {
if (*partial_dir)
}
if (partial_dir) {
if (*partial_dir)
- clean_fname(partial_dir,
1
);
+ clean_fname(partial_dir,
CFN_COLLAPSE_DOT_DOT_DIRS
);
if (!*partial_dir || strcmp(partial_dir, ".") == 0)
partial_dir = NULL;
if (!partial_dir && refused_partial) {
if (!*partial_dir || strcmp(partial_dir, ".") == 0)
partial_dir = NULL;
if (!partial_dir && refused_partial) {
@@
-1606,7
+1606,7
@@
int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
if (server_filter_list.head) {
if (!*files_from)
goto options_rejected;
if (server_filter_list.head) {
if (!*files_from)
goto options_rejected;
- clean_fname(files_from,
1
);
+ clean_fname(files_from,
CFN_COLLAPSE_DOT_DOT_DIRS
);
if (check_filter(&server_filter_list, files_from, 0) < 0)
goto options_rejected;
}
if (check_filter(&server_filter_list, files_from, 0) < 0)
goto options_rejected;
}