} 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 = "";
if ((s = RULE_STRCMP(s, "show")) != NULL)
ch = 'S';
break;
-
default:
ch = *s;
if (s[1] == ',')
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 != '_') {
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);
- if (f >= 0)
+ if (f == f_out)
continue;
}
p = get_rule_prefix(ent->match_flags, ent->pattern, 1, &plen);
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);
}