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);
}
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 {