Updated to apply cleanly.

[rsync/rsync-patches.git] / filter.diff

diff --git a/filter.diff b/filter.diff
index 18dcd82..1ed3c98 100644 (file)
--- a/filter.diff
+++ b/filter.diff
@@ -24,7 +24,7 @@ for the current dir because its name contained a slash.
 ..wayne..
 
 --- exclude.c  27 Apr 2004 01:36:06 -0000      1.75
-+++ exclude.c  27 Apr 2004 01:44:51 -0000
++++ exclude.c  8 May 2004 18:38:51 -0000
 @@ -30,32 +30,65 @@ extern int verbose;
  extern int eol_nulls;
  extern int list_only;
@@ -453,8 +453,8 @@ for the current dir because its name contained a slash.
        add_exclude(&exclude_list, default_cvsignore,
                    XFLG_WORD_SPLIT | XFLG_WORDS_ONLY);
  
---- flist.c    27 Apr 2004 01:36:10 -0000      1.217
-+++ flist.c    27 Apr 2004 01:44:52 -0000
+--- flist.c    3 May 2004 01:24:10 -0000       1.220
++++ flist.c    8 May 2004 18:38:52 -0000
 @@ -39,8 +39,6 @@ extern int module_id;
  extern int ignore_errors;
  extern int numeric_ids;
@@ -493,7 +493,7 @@ for the current dir because its name contained a slash.
                return 1;
        return 0;
  }
-@@ -946,11 +938,7 @@ void send_file_name(int f, struct file_l
+@@ -947,11 +939,7 @@ void send_file_name(int f, struct file_l
  
        if (recursive && S_ISDIR(file->mode)
            && !(file->flags & FLAG_MOUNT_POINT)) {
@@ -505,7 +505,7 @@ for the current dir because its name contained a slash.
        }
  }
  
-@@ -961,6 +949,7 @@ static void send_directory(int f, struct
+@@ -962,6 +950,7 @@ static void send_directory(int f, struct
        struct dirent *di;
        char fname[MAXPATHLEN];
        unsigned int offset;
@@ -513,7 +513,7 @@ for the current dir because its name contained a slash.
        char *p;
  
        d = opendir(dir);
-@@ -985,18 +974,7 @@ static void send_directory(int f, struct
+@@ -986,18 +975,7 @@ static void send_directory(int f, struct
                offset++;
        }
  
@@ -533,7 +533,7 @@ for the current dir because its name contained a slash.
  
        for (errno = 0, di = readdir(d); di; errno = 0, di = readdir(d)) {
                char *dname = d_name(di);
-@@ -1017,6 +995,8 @@ static void send_directory(int f, struct
+@@ -1018,6 +996,8 @@ static void send_directory(int f, struct
                rprintf(FERROR, "readdir(%s): (%d) %s\n",
                        dir, errno, strerror(errno));
        }
@@ -543,7 +543,7 @@ for the current dir because its name contained a slash.
        closedir(d);
  }
 --- proto.h    22 Apr 2004 09:58:09 -0000      1.189
-+++ proto.h    27 Apr 2004 01:44:52 -0000
++++ proto.h    8 May 2004 18:38:52 -0000
 @@ -51,7 +51,8 @@ int start_daemon(int f_in, int f_out);
  int daemon_main(void);
  void setup_protocol(int f_out,int f_in);
@@ -554,8 +554,8 @@ for the current dir because its name contained a slash.
  int check_exclude(struct exclude_list_struct *listp, char *name, int name_is_dir);
  void add_exclude(struct exclude_list_struct *listp, const char *pattern,
                 int xflags);
---- rsync.h    27 Apr 2004 01:36:16 -0000      1.199
-+++ rsync.h    27 Apr 2004 01:44:52 -0000
+--- rsync.h    2 May 2004 16:34:33 -0000       1.200
++++ rsync.h    8 May 2004 18:38:52 -0000
 @@ -490,18 +490,21 @@ struct map_struct {
  #define MATCHFLG_WILD2                (1<<1) /* pattern has '**' */
  #define MATCHFLG_WILD2_PREFIX (1<<2) /* pattern starts with '**' */
@@ -582,9 +582,9 @@ for the current dir because its name contained a slash.
        char *debug_type;
  };
  
---- rsync.yo   24 Apr 2004 06:16:04 -0000      1.164
-+++ rsync.yo   27 Apr 2004 01:44:53 -0000
-@@ -1064,6 +1064,72 @@ itemize(
+--- rsync.yo   7 May 2004 00:18:37 -0000       1.169
++++ rsync.yo   8 May 2004 18:38:53 -0000
+@@ -1075,6 +1075,72 @@ itemize(
    it would be excluded by the "*")
  )