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;
{
struct poptOption *op;
char *cp, shortname[2];
- int is_wild;
+ int is_wild, found_match;
shortname[1] = '\0';
if (strcmp(bp, "delete") == 0)
bp = "delete*";
is_wild = strpbrk(bp, "*?[") != NULL;
+ found_match = 0;
for (op = long_options; ; op++) {
- if (!op->longName) {
- rprintf(FLOG,
- "No match for refuse-options string \"%s\"\n",
- bp);
- break;
- }
*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;
+ found_match = 1;
if (!is_wild)
break;
}
}
+ if (!found_match) {
+ rprintf(FLOG, "No match for refuse-options string \"%s\"\n",
+ bp);
+ }
if (!cp)
break;
*cp = ' ';
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], NULL);
if (tmpdir)
- tmpdir = alloc_sanitize_path(tmpdir, curr_dir);
+ tmpdir = sanitize_path(NULL, tmpdir, "");
if (partial_dir)
- partial_dir = alloc_sanitize_path(partial_dir, curr_dir);
+ partial_dir = sanitize_path(NULL, partial_dir, "");
if (compare_dest)
- compare_dest = alloc_sanitize_path(compare_dest, curr_dir);
+ compare_dest = sanitize_path(NULL, compare_dest, "");
if (backup_dir)
- backup_dir = alloc_sanitize_path(backup_dir, curr_dir);
+ backup_dir = sanitize_path(NULL, backup_dir, "");
if (files_from)
- files_from = alloc_sanitize_path(files_from, curr_dir);
+ files_from = sanitize_path(NULL, files_from, "");
}
if (server_exclude_list.head && !am_sender) {
struct exclude_list_struct *elp = &server_exclude_list;