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
Added a new function, wildmatch_array(), that lets the caller pass
[rsync/rsync.git]
/
exclude.c
diff --git
a/exclude.c
b/exclude.c
index
fa11e44
..
b7c5492
100644
(file)
--- a/
exclude.c
+++ b/
exclude.c
@@
-46,8
+46,8
@@
extern unsigned int curr_dir_len;
extern unsigned int module_dirlen;
struct filter_list_struct filter_list = { 0, 0, "" };
extern unsigned int module_dirlen;
struct filter_list_struct filter_list = { 0, 0, "" };
-struct filter_list_struct cvs_filter_list = { 0, 0, " [
cvsignore
]" };
-struct filter_list_struct server_filter_list = { 0, 0, " [
server
]" };
+struct filter_list_struct cvs_filter_list = { 0, 0, " [
global CVS
]" };
+struct filter_list_struct server_filter_list = { 0, 0, " [
daemon
]" };
/* Need room enough for ":MODS " prefix plus some room to grow. */
#define MAX_RULE_PREFIX (16)
/* Need room enough for ":MODS " prefix plus some room to grow. */
#define MAX_RULE_PREFIX (16)
@@
-133,9
+133,9
@@
static void add_rule(struct filter_list_struct *listp, const char *pat,
listp->debug_type);
}
listp->debug_type);
}
- /* Th
is flag also indicates
that we're reading a list that
+ /* Th
ese flags also indicate
that we're reading a list that
* needs to be filtered now, not post-filtered later. */
* needs to be filtered now, not post-filtered later. */
- if (xflags &
XFLG_ANCHORED2ABS
) {
+ if (xflags &
(XFLG_ANCHORED2ABS|XFLG_ABS_IF_SLASH)
) {
uint32 mf = mflags & (MATCHFLG_RECEIVER_SIDE|MATCHFLG_SENDER_SIDE);
if (am_sender) {
if (mf == MATCHFLG_RECEIVER_SIDE)
uint32 mf = mflags & (MATCHFLG_RECEIVER_SIDE|MATCHFLG_SENDER_SIDE);
if (am_sender) {
if (mf == MATCHFLG_RECEIVER_SIDE)
@@
-150,10
+150,14
@@
static void add_rule(struct filter_list_struct *listp, const char *pat,
out_of_memory("add_rule");
memset(ret, 0, sizeof ret[0]);
out_of_memory("add_rule");
memset(ret, 0, sizeof ret[0]);
- if (xflags & XFLG_ANCHORED2ABS && *pat == '/'
- && !(mflags & (MATCHFLG_ABS_PATH | MATCHFLG_MERGE_FILE))) {
+ if (!(mflags & (MATCHFLG_ABS_PATH | MATCHFLG_MERGE_FILE))
+ && ((xflags & (XFLG_ANCHORED2ABS|XFLG_ABS_IF_SLASH) && *pat == '/')
+ || (xflags & XFLG_ABS_IF_SLASH && strchr(pat, '/') != NULL))) {
mflags |= MATCHFLG_ABS_PATH;
mflags |= MATCHFLG_ABS_PATH;
- ex_len = dirbuf_len - module_dirlen - 1;
+ if (*pat == '/')
+ ex_len = dirbuf_len - module_dirlen - 1;
+ else
+ ex_len = 0;
} else
ex_len = 0;
if (!(ret->pattern = new_array(char, ex_len + pat_len + 1)))
} else
ex_len = 0;
if (!(ret->pattern = new_array(char, ex_len + pat_len + 1)))
@@
-489,22
+493,23
@@
void pop_local_filters(void *mem)
static int rule_matches(char *name, struct filter_struct *ex, int name_is_dir)
{
char *p, full_name[MAXPATHLEN];
static int rule_matches(char *name, struct filter_struct *ex, int name_is_dir)
{
char *p, full_name[MAXPATHLEN];
- int
match_start
= 0;
+ int
anchored_match
= 0;
int ret_match = ex->match_flags & MATCHFLG_NEGATE ? 0 : 1;
char *pattern = ex->pattern;
if (!*name)
return 0;
int ret_match = ex->match_flags & MATCHFLG_NEGATE ? 0 : 1;
char *pattern = ex->pattern;
if (!*name)
return 0;
- /* If the pattern does not have any slashes AND it does not have
- * a "**" (which could match a slash), then we just match the
- * name portion of the path. */
if (!ex->u.slash_cnt && !(ex->match_flags & MATCHFLG_WILD2)) {
if (!ex->u.slash_cnt && !(ex->match_flags & MATCHFLG_WILD2)) {
+ /* If the pattern does not have any slashes AND it does
+ * not have a "**" (which could match a slash), then we
+ * just match the name portion of the path. */
if ((p = strrchr(name,'/')) != NULL)
name = p+1;
if ((p = strrchr(name,'/')) != NULL)
name = p+1;
- }
- else if (ex->match_flags & MATCHFLG_ABS_PATH && *name != '/'
+ } else if (ex->match_flags & MATCHFLG_ABS_PATH && *name != '/'
&& curr_dir_len > module_dirlen + 1) {
&& curr_dir_len > module_dirlen + 1) {
+ /* If we're matching against an absolute-path pattern,
+ * we need to prepend our full path info. */
pathjoin(full_name, sizeof full_name,
curr_dir + module_dirlen + 1, name);
name = full_name;
pathjoin(full_name, sizeof full_name,
curr_dir + module_dirlen + 1, name);
name = full_name;
@@
-514,7
+519,7
@@
static int rule_matches(char *name, struct filter_struct *ex, int name_is_dir)
return !ret_match;
if (*pattern == '/') {
return !ret_match;
if (*pattern == '/') {
-
match_start
= 1;
+
anchored_match
= 1;
pattern++;
if (*name == '/')
name++;
pattern++;
if (*name == '/')
name++;
@@
-523,7
+528,7
@@
static int rule_matches(char *name, struct filter_struct *ex, int name_is_dir)
if (ex->match_flags & MATCHFLG_WILD) {
/* A non-anchored match with an infix slash and no "**"
* needs to match the last slash_cnt+1 name elements. */
if (ex->match_flags & MATCHFLG_WILD) {
/* A non-anchored match with an infix slash and no "**"
* needs to match the last slash_cnt+1 name elements. */
- if (!
match_start
&& ex->u.slash_cnt
+ if (!
anchored_match
&& ex->u.slash_cnt
&& !(ex->match_flags & MATCHFLG_WILD2)) {
int cnt = ex->u.slash_cnt + 1;
for (p = name + strlen(name) - 1; p >= name; p--) {
&& !(ex->match_flags & MATCHFLG_WILD2)) {
int cnt = ex->u.slash_cnt + 1;
for (p = name + strlen(name) - 1; p >= name; p--) {
@@
-540,8
+545,7
@@
static int rule_matches(char *name, struct filter_struct *ex, int name_is_dir)
* pattern at the root. */
if (pattern[2] == '/' && wildmatch(pattern+3, name))
return ret_match;
* pattern at the root. */
if (pattern[2] == '/' && wildmatch(pattern+3, name))
return ret_match;
- }
- else if (!match_start && ex->match_flags & MATCHFLG_WILD2) {
+ } else if (!anchored_match && ex->match_flags & MATCHFLG_WILD2) {
/* A non-anchored match with an infix or trailing "**"
* (but not a prefixed "**") needs to try matching
* after every slash. */
/* A non-anchored match with an infix or trailing "**"
* (but not a prefixed "**") needs to try matching
* after every slash. */
@@
-551,7
+555,7
@@
static int rule_matches(char *name, struct filter_struct *ex, int name_is_dir)
return ret_match;
}
}
return ret_match;
}
}
- } else if (
match_start
) {
+ } else if (
anchored_match
) {
if (strcmp(name,pattern) == 0)
return ret_match;
} else {
if (strcmp(name,pattern) == 0)
return ret_match;
} else {
@@
-674,8
+678,7
@@
static const char *parse_rule_tok(const char *p, uint32 mflags, int xflags,
} else if (*s == '+' && s[1] == ' ') {
new_mflags |= MATCHFLG_INCLUDE;
s += 2;
} else if (*s == '+' && s[1] == ' ') {
new_mflags |= MATCHFLG_INCLUDE;
s += 2;
- }
- if (*s == '!')
+ } else if (*s == '!')
new_mflags |= MATCHFLG_CLEAR_LIST; /* Tentative! */
} else {
char ch = 0, *mods = "";
new_mflags |= MATCHFLG_CLEAR_LIST; /* Tentative! */
} else {
char ch = 0, *mods = "";
@@
-716,7
+719,6
@@
static const char *parse_rule_tok(const char *p, uint32 mflags, int xflags,
if ((s = RULE_STRCMP(s, "show")) != NULL)
ch = 'S';
break;
if ((s = RULE_STRCMP(s, "show")) != NULL)
ch = 'S';
break;
-
default:
ch = *s;
if (s[1] == ',')
default:
ch = *s;
if (s[1] == ',')
@@
-757,7
+759,7
@@
static const char *parse_rule_tok(const char *p, uint32 mflags, int xflags,
mods = NULL;
break;
default:
mods = NULL;
break;
default:
- rprintf(FERROR, "Unknown filter rule:
%s
\n", p);
+ rprintf(FERROR, "Unknown filter rule:
`%s'
\n", p);
exit_cleanup(RERR_SYNTAX);
}
while (mods && *++s && *s != ' ' && *s != '_') {
exit_cleanup(RERR_SYNTAX);
}
while (mods && *++s && *s != ' ' && *s != '_') {
@@
-829,7
+831,8
@@
static const char *parse_rule_tok(const char *p, uint32 mflags, int xflags,
len = strlen((char*)s);
if (new_mflags & MATCHFLG_CLEAR_LIST) {
len = strlen((char*)s);
if (new_mflags & MATCHFLG_CLEAR_LIST) {
- if (!(xflags & XFLG_OLD_PREFIXES) && len) {
+ if (!(mflags & MATCHFLG_NO_PREFIXES)
+ && !(xflags & XFLG_OLD_PREFIXES) && len) {
rprintf(FERROR,
"'!' rule has trailing characters: %s\n", p);
exit_cleanup(RERR_SYNTAX);
rprintf(FERROR,
"'!' rule has trailing characters: %s\n", p);
exit_cleanup(RERR_SYNTAX);
@@
-956,7
+959,7
@@
void parse_filter_file(struct filter_list_struct *listp, const char *fname,
uint32 mflags, int xflags)
{
FILE *fp;
uint32 mflags, int xflags)
{
FILE *fp;
- char line[
MAXPATHLEN+MAX_RULE_PREFIX+1]; /* +1 for trailing slash. */
+ char line[
BIGPATHBUFLEN];
char *eob = line + sizeof line - 1;
int word_split = mflags & MATCHFLG_WORD_SPLIT;
char *eob = line + sizeof line - 1;
int word_split = mflags & MATCHFLG_WORD_SPLIT;
@@
-1034,7
+1037,7
@@
char *get_rule_prefix(int match_flags, const char *pat, int for_xfer,
{
static char buf[MAX_RULE_PREFIX+1];
char *op = buf;
{
static char buf[MAX_RULE_PREFIX+1];
char *op = buf;
- int legal_len = for_xfer && protocol_version < 29 ? 1 : MAX_RULE_PREFIX;
+ int legal_len = for_xfer && protocol_version < 29 ? 1 : MAX_RULE_PREFIX
-1
;
if (match_flags & MATCHFLG_PERDIR_MERGE) {
if (legal_len == 1)
if (match_flags & MATCHFLG_PERDIR_MERGE) {
if (legal_len == 1)
@@
-1071,10
+1074,10
@@
char *get_rule_prefix(int match_flags, const char *pat, int for_xfer,
&& (!for_xfer || protocol_version >= 29
|| (delete_excluded && am_sender)))
*op++ = 'r';
&& (!for_xfer || protocol_version >= 29
|| (delete_excluded && am_sender)))
*op++ = 'r';
- if (legal_len)
- *op++ = ' ';
if (op - buf > legal_len)
return NULL;
if (op - buf > legal_len)
return NULL;
+ if (legal_len)
+ *op++ = ' ';
*op = '\0';
if (plen_ptr)
*plen_ptr = op - buf;
*op = '\0';
if (plen_ptr)
*plen_ptr = op - buf;
@@
-1107,9
+1110,9
@@
static void send_rules(int f_out, struct filter_list_struct *flp)
continue;
if (ent->match_flags & MATCHFLG_CVS_IGNORE
&& !(ent->match_flags & MATCHFLG_MERGE_FILE)) {
continue;
if (ent->match_flags & MATCHFLG_CVS_IGNORE
&& !(ent->match_flags & MATCHFLG_MERGE_FILE)) {
- int f = am_sender || protocol_version < 29 ? f_out : -
1
;
+ int f = am_sender || protocol_version < 29 ? f_out : -
2
;
send_rules(f, &cvs_filter_list);
send_rules(f, &cvs_filter_list);
- if (f
>= 0
)
+ if (f
== f_out
)
continue;
}
p = get_rule_prefix(ent->match_flags, ent->pattern, 1, &plen);
continue;
}
p = get_rule_prefix(ent->match_flags, ent->pattern, 1, &plen);
@@
-1169,7
+1172,7
@@
void send_filter_list(int f_out)
/* This is only called by the server. */
void recv_filter_list(int f_in)
{
/* This is only called by the server. */
void recv_filter_list(int f_in)
{
- char line[
MAXPATHLEN+MAX_RULE_PREFIX+1]; /* +1 for trailing slash. */
+ char line[
BIGPATHBUFLEN];
int xflags = protocol_version >= 29 ? 0 : XFLG_OLD_PREFIXES;
int receiver_wants_list = delete_mode
&& (!delete_excluded || protocol_version >= 29);
int xflags = protocol_version >= 29 ? 0 : XFLG_OLD_PREFIXES;
int receiver_wants_list = delete_mode
&& (!delete_excluded || protocol_version >= 29);
@@
-1178,7
+1181,7
@@
void recv_filter_list(int f_in)
if (!local_server && (am_sender || receiver_wants_list)) {
while ((len = read_int(f_in)) != 0) {
if (len >= sizeof line)
if (!local_server && (am_sender || receiver_wants_list)) {
while ((len = read_int(f_in)) != 0) {
if (len >= sizeof line)
- overflow("recv_rules");
+ overflow
_exit
("recv_rules");
read_sbuf(f_in, line, len);
parse_rule(&filter_list, line, 0, xflags);
}
read_sbuf(f_in, line, len);
parse_rule(&filter_list, line, 0, xflags);
}