X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/d04e9c51b4bc8e0fc1c7065553dcd3ac73a0ae40..fb6e0ea120672aad1ecd2aebb8535d95be49ff8c:/exclude.c

diff --git a/exclude.c b/exclude.c
index 1bb042b3..20542a52 100644
--- a/exclude.c
+++ b/exclude.c
@@ -40,7 +40,7 @@ static struct exclude_struct *make_exclude(const char *pattern, int include)
 	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));
@@ -57,8 +57,8 @@ static struct exclude_struct *make_exclude(const char *pattern, int include)
 	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);
 	}
@@ -238,14 +238,14 @@ void add_exclude(struct exclude_struct ***listp, const char *pattern, int includ
 	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");
@@ -262,7 +262,7 @@ void add_exclude(struct exclude_struct ***listp, const char *pattern, int includ
 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;
@@ -271,10 +271,10 @@ void add_exclude_file(struct exclude_struct ***listp, const char *fname,
 		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",
@@ -286,11 +286,11 @@ void add_exclude_file(struct exclude_struct ***listp, const char *fname,
 	}
 
 	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;
 			}
@@ -306,17 +306,16 @@ void add_exclude_file(struct exclude_struct ***listp, const char *fname,
 			 * 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 protocol_version;
 	extern int list_only, recurse;
 
 	/* This is a complete hack - blame Rusty.
@@ -341,10 +340,6 @@ void send_exclude_list(int f)
 		l = strlen(pattern);
 		if (l == 0) continue;
 		if (exclude_list[i]->include) {
-			if (protocol_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 {