Use buffered I/O to read the exclude list.

[rsync/rsync.git] / exclude.c

diff --git a/exclude.c b/exclude.c
index 1bb042b..e345726 100644 (file)
--- 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,10 +306,10 @@ 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);
 }