#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)
+static void make_exclude(struct exclude_list_struct *listp, const char *pattern,
+ int pat_len, int include)
{
struct exclude_struct *ret;
const char *cp;
if (strpbrk(ret->pattern, "*[?")) {
ret->match_flags |= MATCHFLG_WILD;
- if (strstr(ret->pattern, "**")) {
+ if ((cp = strstr(ret->pattern, "**")) != NULL) {
ret->match_flags |= MATCHFLG_WILD2;
/* If the pattern starts with **, note that. */
- if (*ret->pattern == '*' && ret->pattern[1] == '*')
+ if (cp == ret->pattern)
ret->match_flags |= MATCHFLG_WILD2_PREFIX;
}
}
for (cp = ret->pattern; (cp = strchr(cp, '/')) != NULL; cp++)
ret->slash_cnt++;
- return ret;
+ 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 free_exclude_list(struct exclude_list_struct *listp)
{
- struct exclude_struct **list = *listp;
+ struct exclude_struct *ent, *next;
- if (verbose > 2)
- rprintf(FINFO, "[%s] clearing exclude list\n", who_am_i());
-
- if (!list)
- return;
+ if (verbose > 2) {
+ rprintf(FINFO, "[%s] clearing %sexclude list\n",
+ who_am_i(), listp->debug_type);
+ }
- 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,
}
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);
name = full_name;
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",
+ rprintf(FINFO, "[%s] %scluding %s %s because of %spattern %s%s\n",
who_am_i(), ent->include ? "in" : "ex",
- name_is_dir ? "directory" : "file", name, ent->pattern,
- ent->directory ? "/" : "");
+ name_is_dir ? "directory" : "file", name, type,
+ ent->pattern, ent->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->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.
+ * it back to ask for the next token. This routine will not parse the +/-
+ * prefixes or the "!" token when xflags contains XFLG_WORDS_ONLY. The
+ * *incl_ptr value will be 1 for an include, 0 for an exclude, and -1 for
+ * the list-clearing "!" token.
*/
-static const char *get_exclude_tok(const char *p, int *len_ptr, int xflags)
+static const char *get_exclude_tok(const char *p, int *len_ptr, int *incl_ptr,
+ int xflags)
{
- const unsigned char *s, *t;
-
- /* Skip over any initial spaces */
- for (s = (unsigned char *)p; isspace(*s); s++) {}
-
- /* Remember the beginning of the token. */
- t = s;
+ const unsigned char *s = (const unsigned char *)p;
+ int len;
- /* Do we have a token to parse? */
- if (*s) {
- /* Is this a '+' or '-' followed by a space (not whitespace)? */
- if (!(xflags & XFLG_NO_PREFIXES)
- && (*s == '+' || *s == '-') && s[1] == ' ')
- s += 2;
-
- /* Skip to the next space or the end of the string */
- while (!isspace(*s) && *s != '\0')
+ if (xflags & XFLG_WORD_SPLIT) {
+ /* Skip over any initial whitespace. */
+ while (isspace(*s))
s++;
+ /* Update for "!" check. */
+ p = (const char *)s;
}
- *len_ptr = s - t;
- return (const char *)t;
+ /* Is this a '+' or '-' followed by a space (not whitespace)? */
+ if (!(xflags & XFLG_WORDS_ONLY)
+ && (*s == '-' || *s == '+') && s[1] == ' ') {
+ *incl_ptr = *s == '+';
+ s += 2;
+ } else
+ *incl_ptr = xflags & XFLG_DEF_INCLUDE;
+
+ if (xflags & XFLG_WORD_SPLIT) {
+ const unsigned char *cp = s;
+ /* Token ends at whitespace or the end of the string. */
+ while (!isspace(*cp) && *cp != '\0')
+ cp++;
+ len = cp - s;
+ } else
+ len = strlen(s);
+
+ if (*p == '!' && len == 1 && !(xflags & XFLG_WORDS_ONLY))
+ *incl_ptr = -1;
+
+ *len_ptr = len;
+ 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 add_cnt, pat_len, list_len = 0;
+ int pat_len, incl;
const char *cp;
if (!pattern)
return;
- if (xflags & XFLG_WORD_SPLIT) {
- /* Count how many tokens we need to add. Also looks for
- * the special "!" token, which clears the list up through
- * that token. */
- for (add_cnt = 0, cp = pattern; ; cp += pat_len, add_cnt++) {
- cp = get_exclude_tok(cp, &pat_len, xflags);
- if (!pat_len)
- break;
- if (pat_len == 1 && *cp == '!') {
- free_exclude_list(listp);
- add_cnt = -1; /* Will increment to 0. */
- pattern = cp + 1;
- }
- }
- if (!add_cnt)
- return;
- cp = get_exclude_tok(pattern, &pat_len, xflags);
- } else {
- add_cnt = 1;
- cp = pattern;
- pat_len = strlen(pattern);
-
- if (pat_len == 1 && *cp == '!') {
+ cp = pattern;
+ pat_len = 0;
+ while (1) {
+ cp = get_exclude_tok(cp + pat_len, &pat_len, &incl, xflags);
+ if (!pat_len)
+ break;
+ /* If we got the special "!" token, clear the list. */
+ if (incl < 0)
free_exclude_list(listp);
- return;
- }
- }
-
- if (list)
- for ( ; list[list_len]; list_len++) {}
-
- list = *listp = realloc_array(list, struct exclude_struct *,
- list_len + add_cnt + 1);
- if (!list)
- out_of_memory("add_exclude");
-
- while (pat_len) {
- int incl = xflags & XFLG_DEF_INCLUDE;
- if (!(xflags & XFLG_NO_PREFIXES)
- && (*cp == '-' || *cp == '+')
- && cp[1] == ' ') {
- incl = *cp == '+';
- cp += 2;
- pat_len -= 2;
- }
- list[list_len++] = make_exclude(cp, pat_len, incl);
-
- if (verbose > 2) {
- rprintf(FINFO, "[%s] add_exclude(%s,%s)\n",
- who_am_i(), cp,
- incl ? "include" : "exclude");
+ else {
+ make_exclude(listp, cp, pat_len, incl);
+
+ if (verbose > 2) {
+ rprintf(FINFO, "[%s] add_exclude(%.*s, %s%s)\n",
+ who_am_i(), pat_len, cp,
+ listp->debug_type,
+ incl ? "include" : "exclude");
+ }
}
- cp += pat_len;
- cp = get_exclude_tok(cp, &pat_len, 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;
+ int word_split = xflags & XFLG_WORD_SPLIT;
if (!fname || !*fname)
return;
continue;
break;
}
+ if (word_split && isspace(ch))
+ break;
if (eol_nulls? !ch : (ch == '\n' || ch == '\r'))
break;
if (s < eob)
*s++ = ch;
}
*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->directory) {
p[l++] = '/';
p[l] = '\0';
}
- if (exclude_list[i]->include) {
+ if (ent->include) {
write_int(f, l + 2);
write_buf(f, "+ ", 2);
} else if ((*p == '-' || *p == '+') && p[1] == ' ') {
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