/*
* Return true if file NAME is defined to be excluded by the specified
- * exclude list.
+ * exclude list. Returns -1 for an exclude, 1 for an include, and 0 if
+ * no match.
*/
int check_exclude(struct exclude_list_struct *listp, char *name, int name_is_dir)
{
if (check_one_exclude(name, ent, name_is_dir)) {
report_exclude_result(name, ent, name_is_dir,
listp->debug_type);
- return !ent->include;
+ return ent->include ? 1 : -1;
}
}
*/
static int check_exclude_file(char *fname, int is_dir, int exclude_level)
{
+ int rc;
+
#if 0 /* This currently never happens, so avoid a useless compare. */
if (exclude_level == NO_EXCLUDES)
return 0;
}
}
if (server_exclude_list.head
- && check_exclude(&server_exclude_list, fname, is_dir))
+ && check_exclude(&server_exclude_list, fname, is_dir) < 0)
return 1;
if (exclude_level != ALL_EXCLUDES)
return 0;
- if (exclude_list.head && check_exclude(&exclude_list, fname, is_dir))
- return 1;
+ if (exclude_list.head
+ && (rc = check_exclude(&exclude_list, fname, is_dir)) != 0)
+ return rc < 0;
if (local_exclude_list.head
- && check_exclude(&local_exclude_list, fname, is_dir))
+ && check_exclude(&local_exclude_list, fname, is_dir) < 0)
return 1;
return 0;
}
if (server_exclude_list.head) {
for (s = arg; (s = strchr(s, '/')) != NULL; ) {
*s = '\0';
- if (check_exclude(&server_exclude_list, arg, 1)) {
+ if (check_exclude(&server_exclude_list, arg, 1) < 0) {
/* We must leave arg truncated! */
return 1;
}