#include "rsync.h"
extern int verbose;
+extern int eol_nulls;
+extern int list_only;
+extern int recurse;
-struct exclude_struct **exclude_list;
-struct exclude_struct **local_exclude_list;
-struct exclude_struct **server_exclude_list;
+extern char curr_dir[];
+
+struct exclude_list_struct exclude_list = { 0, 0, "" };
+struct exclude_list_struct local_exclude_list = { 0, 0, "per-dir .cvsignore " };
+struct exclude_list_struct server_exclude_list = { 0, 0, "server " };
char *exclude_path_prefix = NULL;
-/** Build an exclude structure given a exclude pattern */
-static struct exclude_struct *make_exclude(const char *pattern, int pat_len,
- int include)
+/** Build an exclude structure given an exclude pattern. */
+static void make_exclude(struct exclude_list_struct *listp, const char *pat,
+ unsigned int pat_len, unsigned int mflags)
{
struct exclude_struct *ret;
const char *cp;
- int ex_len;
+ unsigned int ex_len;
ret = new(struct exclude_struct);
if (!ret)
out_of_memory("make_exclude");
memset(ret, 0, sizeof ret[0]);
- ret->include = include;
if (exclude_path_prefix)
- ret->match_flags |= MATCHFLG_ABS_PATH;
- if (exclude_path_prefix && *pattern == '/')
+ mflags |= MATCHFLG_ABS_PATH;
+ if (exclude_path_prefix && *pat == '/')
ex_len = strlen(exclude_path_prefix);
else
ex_len = 0;
out_of_memory("make_exclude");
if (ex_len)
memcpy(ret->pattern, exclude_path_prefix, ex_len);
- strlcpy(ret->pattern + ex_len, pattern, pat_len + 1);
+ strlcpy(ret->pattern + ex_len, pat, pat_len + 1);
pat_len += ex_len;
if (strpbrk(ret->pattern, "*[?")) {
- ret->match_flags |= MATCHFLG_WILD;
+ mflags |= MATCHFLG_WILD;
if ((cp = strstr(ret->pattern, "**")) != NULL) {
- ret->match_flags |= MATCHFLG_WILD2;
+ mflags |= MATCHFLG_WILD2;
/* If the pattern starts with **, note that. */
if (cp == ret->pattern)
- ret->match_flags |= MATCHFLG_WILD2_PREFIX;
+ mflags |= MATCHFLG_WILD2_PREFIX;
}
}
if (pat_len > 1 && ret->pattern[pat_len-1] == '/') {
ret->pattern[pat_len-1] = 0;
- ret->directory = 1;
+ mflags |= MATCHFLG_DIRECTORY;
}
for (cp = ret->pattern; (cp = strchr(cp, '/')) != NULL; cp++)
ret->slash_cnt++;
- return ret;
+ ret->match_flags = mflags;
+
+ if (!listp->tail)
+ listp->head = listp->tail = ret;
+ else {
+ listp->tail->next = ret;
+ listp->tail = ret;
+ }
}
static void free_exclude(struct exclude_struct *ex)
{
free(ex->pattern);
- memset(ex, 0, sizeof ex[0]);
free(ex);
}
-
-void free_exclude_list(struct exclude_struct ***listp)
+void clear_exclude_list(struct exclude_list_struct *listp)
{
- struct exclude_struct **list = *listp;
-
- if (verbose > 2)
- rprintf(FINFO, "[%s] clearing exclude list\n", who_am_i());
+ struct exclude_struct *ent, *next;
- if (!list)
- return;
-
- while (*list)
- free_exclude(*list++);
+ for (ent = listp->head; ent; ent = next) {
+ next = ent->next;
+ free_exclude(ent);
+ }
- free(*listp);
- *listp = NULL;
+ listp->head = listp->tail = NULL;
}
static int check_one_exclude(char *name, struct exclude_struct *ex,
int name_is_dir)
{
- char *p;
+ char *p, full_name[MAXPATHLEN];
int match_start = 0;
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 ((p = strrchr(name,'/')) != NULL)
name = p+1;
}
- else if ((ex->match_flags & MATCHFLG_ABS_PATH) && *name != '/') {
- static char full_name[MAXPATHLEN];
- extern char curr_dir[];
- int plus = curr_dir[1] == '\0'? 1 : 0;
- pathjoin(full_name, sizeof full_name, curr_dir+plus, name);
+ else if (ex->match_flags & MATCHFLG_ABS_PATH && *name != '/'
+ && curr_dir[1]) {
+ pathjoin(full_name, sizeof full_name, curr_dir + 1, name);
name = full_name;
}
- if (!name[0]) return 0;
-
- if (ex->directory && !name_is_dir) return 0;
+ if (ex->match_flags & MATCHFLG_DIRECTORY && !name_is_dir)
+ return 0;
if (*pattern == '/') {
match_start = 1;
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->slash_cnt &&
- !(ex->match_flags & MATCHFLG_WILD2)) {
+ if (!match_start && ex->slash_cnt
+ && !(ex->match_flags & MATCHFLG_WILD2)) {
int cnt = ex->slash_cnt + 1;
for (p = name + strlen(name) - 1; p >= name; p--) {
if (*p == '/' && !--cnt)
static void report_exclude_result(char const *name,
struct exclude_struct const *ent,
- int name_is_dir)
+ int name_is_dir, const char *type)
{
/* If a trailing slash is present to match only directories,
* then it is stripped out by make_exclude. So as a special
* case we add it back in here. */
if (verbose >= 2) {
- rprintf(FINFO, "[%s] %scluding %s %s because of pattern %s%s\n",
- who_am_i(), ent->include ? "in" : "ex",
- name_is_dir ? "directory" : "file", name, ent->pattern,
- ent->directory ? "/" : "");
+ rprintf(FINFO, "[%s] %scluding %s %s because of %spattern %s%s\n",
+ who_am_i(),
+ ent->match_flags & MATCHFLG_INCLUDE ? "in" : "ex",
+ name_is_dir ? "directory" : "file", name, type,
+ ent->pattern,
+ ent->match_flags & MATCHFLG_DIRECTORY ? "/" : "");
}
}
/*
- * Return true if file NAME is defined to be excluded by either
- * LOCAL_EXCLUDE_LIST or the globals EXCLUDE_LIST.
+ * Return -1 if file "name" is defined to be excluded by the specified
+ * exclude list, 1 if it is included, and 0 if it was not matched.
*/
-int check_exclude(struct exclude_struct **list, char *name, int name_is_dir)
+int check_exclude(struct exclude_list_struct *listp, char *name, int name_is_dir)
{
struct exclude_struct *ent;
- while ((ent = *list++) != NULL) {
+ for (ent = listp->head; ent; ent = ent->next) {
if (check_one_exclude(name, ent, name_is_dir)) {
- report_exclude_result(name, ent, name_is_dir);
- return !ent->include;
+ report_exclude_result(name, ent, name_is_dir,
+ listp->debug_type);
+ return ent->match_flags & MATCHFLG_INCLUDE ? 1 : -1;
}
}
/* Get the next include/exclude arg from the string. The token will not
* be '\0' terminated, so use the returned length to limit the string.
* Also, be sure to add this length to the returned pointer before passing
- * it back to ask for the next token. This routine will not split off a
- * prefix of "+ " or "- " unless xflags contains XFLG_NO_PREFIXES. The
- * *incl_ptr value will be 1 for an include, 0 for an exclude, and -1 for
- * the list-clearing "!" token.
+ * it back to ask for the next token. This routine parses the "!" (list-
+ * clearing) token and (if xflags does NOT contain XFLG_WORDS_ONLY) the
+ * +/- prefixes for overriding the include/exclude mode. The *flag_ptr
+ * value will also be set to the MATCHFLG_* bits for the current token.
*/
-static const char *get_exclude_tok(const char *p, int *len_ptr, int *incl_ptr,
- int xflags)
+static const char *get_exclude_tok(const char *p, unsigned int *len_ptr,
+ unsigned int *flag_ptr, int xflags)
{
const unsigned char *s = (const unsigned char *)p;
- int len;
+ unsigned int len, mflags = 0;
if (xflags & XFLG_WORD_SPLIT) {
/* Skip over any initial whitespace. */
}
/* Is this a '+' or '-' followed by a space (not whitespace)? */
- if (!(xflags & XFLG_NO_PREFIXES)
+ if (!(xflags & XFLG_WORDS_ONLY)
&& (*s == '-' || *s == '+') && s[1] == ' ') {
- *incl_ptr = *s == '+';
+ if (*s == '+')
+ mflags |= MATCHFLG_INCLUDE;
s += 2;
- } else
- *incl_ptr = xflags & XFLG_DEF_INCLUDE;
+ } else if (xflags & XFLG_DEF_INCLUDE)
+ mflags |= MATCHFLG_INCLUDE;
+ if (xflags & XFLG_DIRECTORY)
+ mflags |= MATCHFLG_DIRECTORY;
if (xflags & XFLG_WORD_SPLIT) {
const unsigned char *cp = s;
} else
len = strlen(s);
- if (*p == '!' && len == 1 && !(xflags & XFLG_NO_PREFIXES))
- *incl_ptr = -1;
+ if (*p == '!' && len == 1)
+ mflags |= MATCHFLG_CLEAR_LIST;
*len_ptr = len;
+ *flag_ptr = mflags;
return (const char *)s;
}
-void add_exclude(struct exclude_struct ***listp, const char *pattern, int xflags)
+void add_exclude(struct exclude_list_struct *listp, const char *pattern,
+ int xflags)
{
- struct exclude_struct **list = *listp;
- int pat_len, list_len = 0;
- int incl, add_cnt = 1;
+ unsigned int pat_len, mflags;
const char *cp;
if (!pattern)
return;
- if (xflags & XFLG_WORD_SPLIT) {
- int add = 0;
- /* Count maximum extra tokens we might encounter. */
- for (cp = pattern; *cp; cp++) {
- if (isspace(*(unsigned char *)cp)) {
- add_cnt += add;
- add = 0;
- } else
- add = 1;
- }
- }
-
- cp = get_exclude_tok(pattern, &pat_len, &incl, xflags);
- if (!pat_len)
- return;
-
- /* Check for the special "!" token that clears the list. Yes, we
- * only honor it at the start of a XFLG_WORD_SPLIT string. */
- if (incl < 0) {
- free_exclude_list(listp);
- if (!--add_cnt)
- return;
- cp = get_exclude_tok(cp + pat_len, &pat_len, &incl, xflags);
+ cp = pattern;
+ pat_len = 0;
+ while (1) {
+ cp = get_exclude_tok(cp + pat_len, &pat_len, &mflags, xflags);
if (!pat_len)
- return;
- }
-
- if (list)
- for ( ; list[list_len]; list_len++) {}
+ break;
- list = *listp = realloc_array(list, struct exclude_struct *,
- list_len + add_cnt + 1);
- if (!list)
- out_of_memory("add_exclude");
+ if (mflags & MATCHFLG_CLEAR_LIST) {
+ if (verbose > 2) {
+ rprintf(FINFO,
+ "[%s] clearing %sexclude list\n",
+ who_am_i(), listp->debug_type);
+ }
+ clear_exclude_list(listp);
+ continue;
+ }
- while (pat_len) {
- list[list_len++] = make_exclude(cp, pat_len, incl);
+ make_exclude(listp, cp, pat_len, mflags);
if (verbose > 2) {
- rprintf(FINFO, "[%s] add_exclude(%s,%s)\n",
- who_am_i(), cp,
- incl ? "include" : "exclude");
+ rprintf(FINFO, "[%s] add_exclude(%.*s, %s%sclude)\n",
+ who_am_i(), (int)pat_len, cp, listp->debug_type,
+ mflags & MATCHFLG_INCLUDE ? "in" : "ex");
}
- cp = get_exclude_tok(cp + pat_len, &pat_len, &incl, xflags);
}
-
- list[list_len] = NULL;
}
-void add_exclude_file(struct exclude_struct ***listp, const char *fname,
+void add_exclude_file(struct exclude_list_struct *listp, const char *fname,
int xflags)
{
FILE *fp;
- char line[MAXPATHLEN];
- char *eob = line + MAXPATHLEN - 1;
- extern int eol_nulls;
+ char line[MAXPATHLEN+3]; /* Room for "x " prefix and trailing slash. */
+ char *eob = line + sizeof line - 1;
+ int word_split = xflags & XFLG_WORD_SPLIT;
if (!fname || !*fname)
return;
while (1) {
char *s = line;
- int ch;
+ int ch, overflow = 0;
while (1) {
if ((ch = getc(fp)) == EOF) {
if (ferror(fp) && errno == EINTR)
continue;
break;
}
+ if (word_split && isspace(ch))
+ break;
if (eol_nulls? !ch : (ch == '\n' || ch == '\r'))
break;
if (s < eob)
*s++ = ch;
+ else
+ overflow = 1;
+ }
+ if (overflow) {
+ rprintf(FERROR, "discarding over-long exclude: %s...\n", line);
+ s = line;
}
*s = '\0';
- if (*line && *line != ';' && *line != '#') {
- /* Skip lines starting with semicolon or pound.
- * It probably wouldn't cause any harm to not skip
- * them but there's no need to save them. */
+ /* Skip an empty token and (when line parsing) comments. */
+ if (*line && (word_split || (*line != ';' && *line != '#')))
add_exclude(listp, line, xflags);
- }
if (ch == EOF)
break;
}
void send_exclude_list(int f)
{
- int i;
- extern int list_only, recurse;
+ struct exclude_struct *ent;
/* This is a complete hack - blame Rusty.
*
if (list_only && !recurse)
add_exclude(&exclude_list, "/*/*", 0);
- if (!exclude_list) {
- write_int(f, 0);
- return;
- }
-
- for (i = 0; exclude_list[i]; i++) {
+ for (ent = exclude_list.head; ent; ent = ent->next) {
unsigned int l;
char p[MAXPATHLEN+1];
- l = strlcpy(p, exclude_list[i]->pattern, sizeof p);
+ l = strlcpy(p, ent->pattern, sizeof p);
if (l == 0 || l >= MAXPATHLEN)
continue;
- if (exclude_list[i]->directory) {
+ if (ent->match_flags & MATCHFLG_DIRECTORY) {
p[l++] = '/';
p[l] = '\0';
}
- if (exclude_list[i]->include) {
+ if (ent->match_flags & MATCHFLG_INCLUDE) {
write_int(f, l + 2);
write_buf(f, "+ ", 2);
} else if ((*p == '-' || *p == '+') && p[1] == ' ') {
void recv_exclude_list(int f)
{
- char line[MAXPATHLEN+1]; /* Allows a trailing slash on a max-len dir */
+ char line[MAXPATHLEN+3]; /* Room for "x " prefix and trailing slash. */
unsigned int l;
while ((l = read_int(f)) != 0) {
char *p;
add_exclude(&exclude_list, default_cvsignore,
- XFLG_WORD_SPLIT | XFLG_NO_PREFIXES);
+ XFLG_WORD_SPLIT | XFLG_WORDS_ONLY);
if ((p = getenv("HOME"))
&& pathjoin(fname, sizeof fname, p, ".cvsignore") < sizeof fname) {
add_exclude_file(&exclude_list, fname,
- XFLG_WORD_SPLIT | XFLG_NO_PREFIXES);
+ XFLG_WORD_SPLIT | XFLG_WORDS_ONLY);
}
add_exclude(&exclude_list, getenv("CVSIGNORE"),
- XFLG_WORD_SPLIT | XFLG_NO_PREFIXES);
+ XFLG_WORD_SPLIT | XFLG_WORDS_ONLY);
}
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff