- always flush the IO write buffer when reading

- handle start of line in exclude properly

diff --git a/exclude.c b/exclude.c
index 577c289b54154d206dfcfc100fbb8b2613656cc4..ab01234cd73fe52b6b608bd2e04f3a03906e7eb8 100644 (file)
--- a/exclude.c
+++ b/exclude.c
@@ -93,13 +93,13 @@ static int check_one_exclude(char *name,struct exclude_struct *ex,
        }
 
        if (ex->regular_exp) {
-               if (fnmatch(ex->pattern, name, 0) == 0)
+               if (fnmatch(pattern, name, 0) == 0)
                        return 1;
        } else {
                int l1 = strlen(name);
-               int l2 = strlen(ex->pattern);
+               int l2 = strlen(pattern);
                if (l2 <= l1 && 
-                   strcmp(name+(l1-l2),ex->pattern) == 0 &&
+                   strcmp(name+(l1-l2),pattern) == 0 &&
                    (l1==l2 || (!match_start && name[l1-(l2+1)] == '/')))
                        return 1;
        }

diff --git a/io.c b/io.c
index 4c704ebe005b92791deb9553b9c2183cafc9c12a..03da79ce46c09db9a1c6718d5c1b8afa5eefca99 100644 (file)
--- a/io.c
+++ b/io.c
@@ -86,6 +86,8 @@ static int read_timeout(int fd, char *buf, int len)
 {
        int n, ret=0;
 
+       io_flush();
+
        while (ret == 0) {
                fd_set fds;
                struct timeval tv;