char *cp;
int pat_len;
- ret = (struct exclude_struct *)malloc(sizeof(*ret));
+ ret = new(struct exclude_struct);
if (!ret) out_of_memory("make_exclude");
memset(ret, 0, sizeof(*ret));
if (exclude_path_prefix)
ret->match_flags |= MATCHFLG_ABS_PATH;
if (exclude_path_prefix && *pattern == '/') {
- ret->pattern = malloc(strlen(exclude_path_prefix)
- + strlen(pattern) + 1);
+ ret->pattern = new_array(char,
+ strlen(exclude_path_prefix) + strlen(pattern) + 1);
if (!ret->pattern) out_of_memory("make_exclude");
sprintf(ret->pattern, "%s%s", exclude_path_prefix, pattern);
}
if (strpbrk(pattern, "*[?")) {
ret->match_flags |= MATCHFLG_WILD;
if (strstr(pattern, "**")) {
- static int tested;
- if (!tested) {
- tested = 1;
- if (fnmatch("a/b/*","a/b/c/d",FNM_PATHNAME)==0)
- rprintf(FERROR,"WARNING: fnmatch FNM_PATHNAME is broken on your system\n");
- }
ret->match_flags |= MATCHFLG_WILD2;
/* If the pattern starts with **, note that. */
if (*pattern == '*' && pattern[1] == '*')
static char full_name[MAXPATHLEN];
extern char curr_dir[];
int plus = curr_dir[1] == '\0'? 1 : 0;
- snprintf(full_name, sizeof full_name,
- "%s/%s", curr_dir+plus, name);
+ pathjoin(full_name, sizeof full_name, curr_dir+plus, name);
name = full_name;
}
}
if (ex->match_flags & MATCHFLG_WILD) {
- int fnmatch_flags = (ex->match_flags & MATCHFLG_WILD2)?
- 0 : FNM_PATHNAME;
/* 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 &&
}
name = p+1;
}
- if (fnmatch(pattern, name, fnmatch_flags) == 0)
+ if (wildmatch(pattern, name))
return 1;
if (ex->match_flags & MATCHFLG_WILD2_PREFIX) {
/* If the **-prefixed pattern has a '/' as the next
* character, then try to match the rest of the
* pattern at the root. */
- if (pattern[2] == '/' &&
- fnmatch(pattern+3, name, fnmatch_flags) == 0)
+ if (pattern[2] == '/' && wildmatch(pattern+3, name))
return 1;
}
else if (!match_start && ex->match_flags & MATCHFLG_WILD2) {
* after every slash. */
while ((name = strchr(name, '/')) != NULL) {
name++;
- if (fnmatch(pattern, name, fnmatch_flags) == 0)
+ if (wildmatch(pattern, name))
return 1;
}
}
int len = 0;
if (*pattern == '!' && !pattern[1]) {
- free_exclude_list(listp);
- return;
+ free_exclude_list(listp);
+ return;
}
if (list)
for (; list[len]; len++) {}
- list = *listp = (struct exclude_struct **)Realloc(list,sizeof(struct exclude_struct *)*(len+2));
+ list = *listp = realloc_array(list, struct exclude_struct *, len+2);
if (!list || !(list[len] = make_exclude(pattern, include)))
out_of_memory("add_exclude");
void add_exclude_file(struct exclude_struct ***listp, const char *fname,
int fatal, int include)
{
- int fd;
+ FILE *fp;
char line[MAXPATHLEN];
char *eob = line + MAXPATHLEN - 1;
extern int eol_nulls;
return;
if (*fname != '-' || fname[1])
- fd = open(fname, O_RDONLY|O_BINARY);
+ fp = fopen(fname, "rb");
else
- fd = 0;
- if (fd < 0) {
+ fp = stdin;
+ if (!fp) {
if (fatal) {
rsyserr(FERROR, errno,
"failed to open %s file %s",
}
while (1) {
- char ch, *s = line;
- int cnt;
+ char *s = line;
+ int ch;
while (1) {
- if ((cnt = read(fd, &ch, 1)) <= 0) {
- if (cnt < 0 && errno == EINTR)
+ if ((ch = getc(fp)) == EOF) {
+ if (ferror(fp) && errno == EINTR)
continue;
break;
}
* them but there's no need to save them. */
add_exclude(listp, line, include);
}
- if (cnt <= 0)
+ if (ch == EOF)
break;
}
- close(fd);
+ fclose(fp);
}
void send_exclude_list(int f)
{
int i;
- extern int remote_version;
extern int list_only, recurse;
/* This is a complete hack - blame Rusty.
l = strlen(pattern);
if (l == 0) continue;
if (exclude_list[i]->include) {
- if (remote_version < 19) {
- rprintf(FERROR,"remote rsync does not support include syntax - aborting\n");
- exit_cleanup(RERR_UNSUPPORTED);
- }
write_int(f,l+2);
write_buf(f,"+ ",2);
} else {
for (i=0; cvs_ignore_list[i]; i++)
add_exclude(&exclude_list, cvs_ignore_list[i], ADD_EXCLUDE);
- if ((p=getenv("HOME")) && strlen(p) < (MAXPATHLEN-12)) {
- snprintf(fname,sizeof(fname), "%s/.cvsignore",p);
- add_exclude_file(&exclude_list,fname,MISSING_OK,ADD_EXCLUDE);
- }
+ if ((p = getenv("HOME"))
+ && pathjoin(fname, sizeof fname, p, ".cvsignore") < sizeof fname)
+ add_exclude_file(&exclude_list, fname, MISSING_OK, ADD_EXCLUDE);
add_exclude_line(&exclude_list, getenv("CVSIGNORE"), ADD_EXCLUDE);
}