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
Call clean_flist() with its new "collapse_dot_dot" arg.
[rsync/rsync.git]
/
options.c
diff --git
a/options.c
b/options.c
index
c8d1a5c
..
ec42bf8
100644
(file)
--- a/
options.c
+++ b/
options.c
@@
-23,7
+23,6
@@
extern int sanitize_paths;
extern int select_timeout;
extern int sanitize_paths;
extern int select_timeout;
-extern char curr_dir[MAXPATHLEN];
extern struct exclude_list_struct exclude_list;
extern struct exclude_list_struct server_exclude_list;
extern struct exclude_list_struct exclude_list;
extern struct exclude_list_struct server_exclude_list;
@@
-440,7
+439,7
@@
static void set_refuse_options(char *bp)
{
struct poptOption *op;
char *cp, shortname[2];
{
struct poptOption *op;
char *cp, shortname[2];
- int is_wild;
+ int is_wild
, found_match
;
shortname[1] = '\0';
shortname[1] = '\0';
@@
-454,20
+453,23
@@
static void set_refuse_options(char *bp)
if (strcmp(bp, "delete") == 0)
bp = "delete*";
is_wild = strpbrk(bp, "*?[") != NULL;
if (strcmp(bp, "delete") == 0)
bp = "delete*";
is_wild = strpbrk(bp, "*?[") != NULL;
+ found_match = 0;
for (op = long_options; ; op++) {
for (op = long_options; ; op++) {
- if (!op->longName) {
- rprintf(FLOG,
- "No match for refuse-options string \"%s\"\n",
- bp);
- break;
- }
*shortname = op->shortName;
*shortname = op->shortName;
- if (wildmatch(bp, op->longName) || wildmatch(bp, shortname)) {
+ if (!op->longName && !*shortname)
+ break;
+ if ((op->longName && wildmatch(bp, op->longName))
+ || (*shortname && wildmatch(bp, shortname))) {
op->val = (op - long_options) + OPT_REFUSED_BASE;
op->val = (op - long_options) + OPT_REFUSED_BASE;
+ found_match = 1;
if (!is_wild)
break;
}
}
if (!is_wild)
break;
}
}
+ if (!found_match) {
+ rprintf(FLOG, "No match for refuse-options string \"%s\"\n",
+ bp);
+ }
if (!cp)
break;
*cp = ' ';
if (!cp)
break;
*cp = ' ';
@@
-660,12
+662,6
@@
int parse_arguments(int *argc, const char ***argv, int frommain)
}
#endif
}
#endif
- if (block_size > MAX_BLOCK_SIZE) {
- rprintf(FINFO, "limiting block-size to %d bytes\n",
- MAX_BLOCK_SIZE);
- block_size = MAX_BLOCK_SIZE;
- }
-
if (write_batch && read_batch) {
snprintf(err_buf, sizeof err_buf,
"--write-batch and --read-batch can not be used together\n");
if (write_batch && read_batch) {
snprintf(err_buf, sizeof err_buf,
"--write-batch and --read-batch can not be used together\n");
@@
-732,43
+728,43
@@
int parse_arguments(int *argc, const char ***argv, int frommain)
if (sanitize_paths) {
int i;
for (i = *argc; i-- > 0; )
if (sanitize_paths) {
int i;
for (i = *argc; i-- > 0; )
- (*argv)[i] =
alloc_sanitize_path((*argv)[i], NULL
);
+ (*argv)[i] =
sanitize_path(NULL, (*argv)[i], "", 0
);
if (tmpdir)
if (tmpdir)
- tmpdir =
alloc_sanitize_path(tmpdir, curr_dir
);
+ tmpdir =
sanitize_path(NULL, tmpdir, NULL, 0
);
if (partial_dir)
if (partial_dir)
- partial_dir =
alloc_sanitize_path(partial_dir, curr_dir
);
+ partial_dir =
sanitize_path(NULL, partial_dir, NULL, 0
);
if (compare_dest)
if (compare_dest)
- compare_dest =
alloc_sanitize_path(compare_dest, curr_dir
);
+ compare_dest =
sanitize_path(NULL, compare_dest, NULL, 0
);
if (backup_dir)
if (backup_dir)
- backup_dir =
alloc_sanitize_path(backup_dir, curr_dir
);
+ backup_dir =
sanitize_path(NULL, backup_dir, NULL, 0
);
if (files_from)
if (files_from)
- files_from =
alloc_sanitize_path(files_from, curr_dir
);
+ 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 (tmpdir) {
}
if (server_exclude_list.head && !am_sender) {
struct exclude_list_struct *elp = &server_exclude_list;
if (tmpdir) {
- clean_fname(tmpdir);
+ clean_fname(tmpdir
, 1
);
if (check_exclude(elp, tmpdir, 1) < 0)
goto options_rejected;
}
if (partial_dir) {
if (check_exclude(elp, tmpdir, 1) < 0)
goto options_rejected;
}
if (partial_dir) {
- clean_fname(partial_dir);
+ clean_fname(partial_dir
, 1
);
if (check_exclude(elp, partial_dir, 1) < 0)
goto options_rejected;
}
if (compare_dest) {
if (check_exclude(elp, partial_dir, 1) < 0)
goto options_rejected;
}
if (compare_dest) {
- clean_fname(compare_dest);
+ clean_fname(compare_dest
, 1
);
if (check_exclude(elp, compare_dest, 1) < 0)
goto options_rejected;
}
if (backup_dir) {
if (check_exclude(elp, compare_dest, 1) < 0)
goto options_rejected;
}
if (backup_dir) {
- clean_fname(backup_dir);
+ clean_fname(backup_dir
, 1
);
if (check_exclude(elp, backup_dir, 1) < 0)
goto options_rejected;
}
}
if (server_exclude_list.head && files_from) {
if (check_exclude(elp, backup_dir, 1) < 0)
goto options_rejected;
}
}
if (server_exclude_list.head && files_from) {
- clean_fname(files_from);
+ clean_fname(files_from
, 1
);
if (check_exclude(&server_exclude_list, files_from, 0) < 0) {
options_rejected:
snprintf(err_buf, sizeof err_buf,
if (check_exclude(&server_exclude_list, files_from, 0) < 0) {
options_rejected:
snprintf(err_buf, sizeof err_buf,