preparing for release of 2.1.1

[rsync/rsync.git] / flist.c

diff --git a/flist.c b/flist.c
index cb14d70..693e900 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -94,7 +94,7 @@ static void send_directory(int f,struct file_list *flist,char *dir);
 static char *flist_dir;
 
 
-void send_file_entry(struct file_struct *file,int f,unsigned base_flags)
+static void send_file_entry(struct file_struct *file,int f,unsigned base_flags)
 {
        unsigned char flags;
        static time_t last_time;
@@ -498,6 +498,8 @@ static void send_directory(int f,struct file_list *flist,char *dir)
        }
        p = fname + strlen(fname);
 
+       local_exclude_list = NULL;
+
        if (cvs_exclude) {
                if (strlen(fname) + strlen(".cvsignore") <= MAXPATHLEN-1) {
                        strcpy(p,".cvsignore");
@@ -517,6 +519,10 @@ static void send_directory(int f,struct file_list *flist,char *dir)
                send_file_name(f,flist,fname,recurse,0);
        }
 
+       if (local_exclude_list) {
+               add_exclude_list("!", &local_exclude_list, 0);
+       }
+
        closedir(d);
 }