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
Check for the lchmod() and lutimes() functions.
[rsync/rsync.git]
/
exclude.c
diff --git
a/exclude.c
b/exclude.c
index
9455609
..
59b4ef5
100644
(file)
--- a/
exclude.c
+++ b/
exclude.c
@@
-621,9
+621,9
@@
int check_filter(struct filter_list_struct *listp, char *name, int name_is_dir)
#define RULE_STRCMP(s,r) rule_strcmp((s), (r), sizeof (r) - 1)
#define RULE_STRCMP(s,r) rule_strcmp((s), (r), sizeof (r) - 1)
-static const
char *rule_strcmp(const
char *str, const char *rule, int rule_len)
+static const
uchar *rule_strcmp(const u
char *str, const char *rule, int rule_len)
{
{
- if (strncmp(str, rule, rule_len) != 0)
+ if (strncmp(
(char*)
str, rule, rule_len) != 0)
return NULL;
if (isspace(str[rule_len]) || str[rule_len] == '_' || !str[rule_len])
return str + rule_len - 1;
return NULL;
if (isspace(str[rule_len]) || str[rule_len] == '_' || !str[rule_len])
return str + rule_len - 1;
@@
-674,8
+674,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
+715,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
+755,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 != '_') {
@@
-1034,7
+1032,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
+1069,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
+1105,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);
@@
-1178,7
+1176,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);
}