Updated to apply cleanly.

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

diff --git a/filter.diff b/filter.diff
index 8796b84..ffaf81c 100644 (file)
--- a/filter.diff
+++ b/filter.diff
@@ -739,9 +739,9 @@ that's how you can make rules local instead of inherited).
        add_exclude(&exclude_list, default_cvsignore,
                    XFLG_WORD_SPLIT | XFLG_WORDS_ONLY);
  
---- orig/flist.c       2004-08-12 18:34:38
+--- orig/flist.c       2004-09-21 09:40:27
 +++ flist.c    2004-08-12 18:59:28
-@@ -39,10 +39,9 @@ extern int module_id;
+@@ -40,10 +40,9 @@ extern int module_id;
  extern int ignore_errors;
  extern int numeric_ids;
  
@@ -753,7 +753,7 @@ that's how you can make rules local instead of inherited).
  extern char *files_from;
  extern int filesfrom_fd;
  
-@@ -66,7 +65,6 @@ extern int list_only;
+@@ -67,7 +66,6 @@ extern int list_only;
  
  extern struct exclude_list_struct exclude_list;
  extern struct exclude_list_struct server_exclude_list;
@@ -761,7 +761,7 @@ that's how you can make rules local instead of inherited).
  
  int io_error;
  
-@@ -221,8 +219,6 @@ int link_stat(const char *path, STRUCT_S
+@@ -223,8 +221,6 @@ int link_stat(const char *path, STRUCT_S
   */
  static int check_exclude_file(char *fname, int is_dir, int exclude_level)
  {
@@ -770,7 +770,7 @@ that's how you can make rules local instead of inherited).
  #if 0 /* This currently never happens, so avoid a useless compare. */
        if (exclude_level == NO_EXCLUDES)
                return 0;
-@@ -244,10 +240,7 @@ static int check_exclude_file(char *fnam
+@@ -246,10 +242,7 @@ static int check_exclude_file(char *fnam
        if (exclude_level != ALL_EXCLUDES)
                return 0;
        if (exclude_list.head
@@ -782,7 +782,7 @@ that's how you can make rules local instead of inherited).
                return 1;
        return 0;
  }
-@@ -956,15 +949,7 @@ void send_file_name(int f, struct file_l
+@@ -978,15 +971,7 @@ void send_file_name(int f, struct file_l
  
        if (recursive && S_ISDIR(file->mode)
            && !(file->flags & FLAG_MOUNT_POINT)) {
@@ -798,7 +798,7 @@ that's how you can make rules local instead of inherited).
        }
  }
  
-@@ -975,6 +960,7 @@ static void send_directory(int f, struct
+@@ -997,6 +982,7 @@ static void send_directory(int f, struct
        struct dirent *di;
        char fname[MAXPATHLEN];
        unsigned int offset;
@@ -806,7 +806,7 @@ that's how you can make rules local instead of inherited).
        char *p;
  
        d = opendir(dir);
-@@ -998,18 +984,7 @@ static void send_directory(int f, struct
+@@ -1020,18 +1006,7 @@ static void send_directory(int f, struct
                offset++;
        }
  
@@ -826,7 +826,7 @@ that's how you can make rules local instead of inherited).
  
        for (errno = 0, di = readdir(d); di; errno = 0, di = readdir(d)) {
                char *dname = d_name(di);
-@@ -1030,6 +1005,8 @@ static void send_directory(int f, struct
+@@ -1052,6 +1027,8 @@ static void send_directory(int f, struct
                rsyserr(FERROR, errno, "readdir(%s)", dir);
        }
  
@@ -835,7 +835,7 @@ that's how you can make rules local instead of inherited).
        closedir(d);
  }
  
-@@ -1049,6 +1026,7 @@ struct file_list *send_file_list(int f, 
+@@ -1071,6 +1048,7 @@ struct file_list *send_file_list(int f, 
        char *p, *dir, olddir[sizeof curr_dir];
        char lastpath[MAXPATHLEN] = "";
        struct file_list *flist;
@@ -843,7 +843,7 @@ that's how you can make rules local instead of inherited).
        int64 start_write;
        int use_ff_fd = 0;
  
-@@ -1069,6 +1047,10 @@ struct file_list *send_file_list(int f, 
+@@ -1091,6 +1069,10 @@ struct file_list *send_file_list(int f, 
                                exit_cleanup(RERR_FILESELECT);
                        }
                        use_ff_fd = 1;
@@ -854,7 +854,7 @@ that's how you can make rules local instead of inherited).
                }
        }
  
-@@ -1099,6 +1081,15 @@ struct file_list *send_file_list(int f, 
+@@ -1121,6 +1103,15 @@ struct file_list *send_file_list(int f, 
                        }
                }
  
@@ -870,7 +870,7 @@ that's how you can make rules local instead of inherited).
                if (link_stat(fname, &st, keep_dirlinks) != 0) {
                        if (f != -1) {
                                io_error |= IOERR_GENERAL;
---- orig/options.c     2004-08-12 18:34:38
+--- orig/options.c     2004-09-20 05:10:48
 +++ options.c  2004-08-12 18:59:28
 @@ -287,6 +287,7 @@ void usage(enum logcode F)
    rprintf(F,"     --include=PATTERN       don't exclude files matching PATTERN\n");
@@ -888,7 +888,7 @@ that's how you can make rules local instead of inherited).
    {0,                 'P', POPT_ARG_NONE,   0,              'P', 0, 0 },
    {"config",           0,  POPT_ARG_STRING, &config_file, 0, 0, 0 },
    {"port",             0,  POPT_ARG_INT,    &rsync_port, 0, 0, 0 },
-@@ -589,6 +591,11 @@ int parse_arguments(int *argc, const cha
+@@ -585,6 +587,11 @@ int parse_arguments(int *argc, const cha
                        am_sender = 1;
                        break;
  
@@ -930,7 +930,7 @@ that's how you can make rules local instead of inherited).
  };
  
  struct exclude_list_struct {
---- orig/rsync.yo      2004-08-13 07:18:59
+--- orig/rsync.yo      2004-09-20 05:10:48
 +++ rsync.yo   2004-08-13 00:43:31
 @@ -364,6 +364,7 @@ verb(
       --include=PATTERN       don't exclude files matching PATTERN
@@ -940,7 +940,7 @@ that's how you can make rules local instead of inherited).
   -0  --from0                 all file lists are delimited by nulls
       --version               print version number
       --daemon                run as an rsync daemon
-@@ -1008,24 +1009,32 @@ The exclude and include patterns specifi
+@@ -1025,24 +1026,32 @@ The exclude and include patterns specifi
  selection of which files to transfer and which files to skip.
  
  Rsync builds an ordered list of include/exclude options as specified on
@@ -981,7 +981,7 @@ that's how you can make rules local instead of inherited).
  
  Let's say that we want to match two source files, one with an absolute
  path of "/home/me/foo/bar", and one with a path of "/home/you/bar/baz".
-@@ -1072,23 +1081,27 @@ because rsync did not descend through th
+@@ -1089,23 +1098,27 @@ because rsync did not descend through th
  hierarchy.
  
  Note also that the --include and --exclude options take one pattern
@@ -1020,7 +1020,7 @@ that's how you can make rules local instead of inherited).
  
    it() if the pattern ends with a / then it will only match a
    directory, not a file, link, or device.
-@@ -1101,22 +1114,31 @@ itemize(
+@@ -1118,22 +1131,31 @@ itemize(
    single asterisk pattern "*" will stop at slashes.
  
    it() if the pattern contains a / (not counting a trailing /) or a "**"
@@ -1056,7 +1056,7 @@ that's how you can make rules local instead of inherited).
  )
  
  The +/- rules are most useful in a list that was read from a file, allowing
-@@ -1163,8 +1185,160 @@ itemize(
+@@ -1180,8 +1202,160 @@ itemize(
    it() --include "*/" --include "*.c" --exclude "*" would include all 
    directories and C source files
    it() --include "foo/" --include "foo/bar.c" --exclude "*" would include