mirror/rsync
1
0
Fork 0
mirror of https://github.com/RsyncProject/rsync.git synced 2026-03-02 05:18:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

Implemented a "!" modifier for filter rules that lets a rule trigger

Browse Source 
on a non-matching pattern.
This commit is contained in:
Wayne Davison
2005-02-03 03:36:58 +00:00
parent 7c8e23bd9f
commit f2ae9e8583
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
exclude.c
View File

@@ -476,6 +476,7 @@ static int rule_matches(char *name, struct filter_struct *ex, int name_is_dir)
{
char *p, full_name[MAXPATHLEN];
int match_start = 0;
int ret_match = ex->match_flags & MATCHFLG_NEGATE ? 0 : 1;
char *pattern = ex->pattern;
if (!*name)
@@ -496,7 +497,7 @@ static int rule_matches(char *name, struct filter_struct *ex, int name_is_dir)
}
if (ex->match_flags & MATCHFLG_DIRECTORY && !name_is_dir)
return 0;
return !ret_match;
if (*pattern == '/') {
match_start = 1;
@@ -518,13 +519,13 @@ static int rule_matches(char *name, struct filter_struct *ex, int name_is_dir)
name = p+1;
}
if (wildmatch(pattern, name))
return 1;
return ret_match;
if (ex->match_flags & MATCHFLG_WILD2_PREFIX) {
/* If the **-prefixed pattern has a '/' as the next
* character, then try to match the rest of the
* pattern at the root. */
if (pattern[2] == '/' && wildmatch(pattern+3, name))
return 1;
return ret_match;
}
else if (!match_start && ex->match_flags & MATCHFLG_WILD2) {
/* A non-anchored match with an infix or trailing "**"
@@ -533,23 +534,23 @@ static int rule_matches(char *name, struct filter_struct *ex, int name_is_dir)
while ((name = strchr(name, '/')) != NULL) {
name++;
if (wildmatch(pattern, name))
return 1;
return ret_match;
}
}
} else if (match_start) {
if (strcmp(name,pattern) == 0)
return 1;
return ret_match;
} else {
int l1 = strlen(name);
int l2 = strlen(pattern);
if (l2 <= l1 &&
strcmp(name+(l1-l2),pattern) == 0 &&
(l1==l2 || name[l1-(l2+1)] == '/')) {
return 1;
return ret_match;
}
}
return 0;
return !ret_match;
}
@@ -639,7 +640,7 @@ static const char *get_filter_tok(const char *p, int xflags,
mflags |= MATCHFLG_INCLUDE;
/* FALL THROUGH */
case '-':
mods = "/";
mods = "!/";
break;
case '!':
mflags |= MATCHFLG_CLEAR_LIST;
@@ -671,6 +672,9 @@ static const char *get_filter_tok(const char *p, int xflags,
case '/':
mflags |= MATCHFLG_ABS_PATH;
break;
case '!':
mflags |= MATCHFLG_NEGATE;
break;
case 'C':
empty_pat_is_OK = 1;
mflags |= MATCHFLG_NO_PREFIXES