Updated to apply to latest source.

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

diff --git a/filter.diff b/filter.diff
index fb2abca..e7790e1 100644 (file)
--- a/filter.diff
+++ b/filter.diff
@@ -30,8 +30,8 @@ contained a slash.
 
 ..wayne..
 
---- exclude.c  22 May 2004 05:32:20 -0000      1.82
-+++ exclude.c  11 Jun 2004 07:55:58 -0000
+--- orig/exclude.c     2004-05-22 19:30:03
++++ exclude.c  2004-07-03 20:21:27
 @@ -30,13 +30,59 @@ extern int verbose;
  extern int eol_nulls;
  extern int list_only;
@@ -459,8 +459,8 @@ contained a slash.
        add_exclude(&exclude_list, default_cvsignore,
                    XFLG_WORD_SPLIT | XFLG_WORDS_ONLY);
  
---- flist.c    11 Jun 2004 07:40:57 -0000      1.230
-+++ flist.c    11 Jun 2004 07:55:58 -0000
+--- orig/flist.c       2004-07-15 02:21:10
++++ flist.c    2004-07-03 20:21:27
 @@ -39,8 +39,6 @@ extern int module_id;
  extern int ignore_errors;
  extern int numeric_ids;
@@ -478,7 +478,7 @@ contained a slash.
  extern int sanitize_paths;
  extern int delete_excluded;
  extern int orig_umask;
-@@ -69,7 +68,6 @@ extern int write_batch;
+@@ -66,7 +65,6 @@ extern int list_only;
  
  extern struct exclude_list_struct exclude_list;
  extern struct exclude_list_struct server_exclude_list;
@@ -486,7 +486,7 @@ contained a slash.
  
  int io_error;
  
-@@ -224,8 +222,6 @@ int link_stat(const char *path, STRUCT_S
+@@ -221,8 +219,6 @@ int link_stat(const char *path, STRUCT_S
   */
  static int check_exclude_file(char *fname, int is_dir, int exclude_level)
  {
@@ -495,7 +495,7 @@ contained a slash.
  #if 0 /* This currently never happens, so avoid a useless compare. */
        if (exclude_level == NO_EXCLUDES)
                return 0;
-@@ -247,10 +243,7 @@ static int check_exclude_file(char *fnam
+@@ -244,10 +240,7 @@ static int check_exclude_file(char *fnam
        if (exclude_level != ALL_EXCLUDES)
                return 0;
        if (exclude_list.head
@@ -507,7 +507,7 @@ contained a slash.
                return 1;
        return 0;
  }
-@@ -960,15 +953,7 @@ void send_file_name(int f, struct file_l
+@@ -954,15 +947,7 @@ void send_file_name(int f, struct file_l
  
        if (recursive && S_ISDIR(file->mode)
            && !(file->flags & FLAG_MOUNT_POINT)) {
@@ -523,7 +523,7 @@ contained a slash.
        }
  }
  
-@@ -979,6 +964,7 @@ static void send_directory(int f, struct
+@@ -973,6 +958,7 @@ static void send_directory(int f, struct
        struct dirent *di;
        char fname[MAXPATHLEN];
        unsigned int offset;
@@ -531,7 +531,7 @@ contained a slash.
        char *p;
  
        d = opendir(dir);
-@@ -1002,19 +988,13 @@ static void send_directory(int f, struct
+@@ -996,19 +982,13 @@ static void send_directory(int f, struct
                offset++;
        }
  
@@ -556,7 +556,7 @@ contained a slash.
        for (errno = 0, di = readdir(d); di; errno = 0, di = readdir(d)) {
                char *dname = d_name(di);
                if (dname[0] == '.' && (dname[1] == '\0'
-@@ -1034,6 +1014,8 @@ static void send_directory(int f, struct
+@@ -1028,6 +1008,8 @@ static void send_directory(int f, struct
                rsyserr(FERROR, errno, "readdir(%s)", dir);
        }
  
@@ -565,8 +565,8 @@ contained a slash.
        closedir(d);
  }
  
---- options.c  7 Jun 2004 22:05:22 -0000       1.156
-+++ options.c  11 Jun 2004 07:55:59 -0000
+--- orig/options.c     2004-07-15 16:51:50
++++ options.c  2004-07-03 20:21:27
 @@ -50,6 +50,7 @@ int preserve_gid = 0;
  int preserve_times = 0;
  int update_only = 0;
@@ -575,7 +575,7 @@ contained a slash.
  int dry_run = 0;
  int local_server = 0;
  int ignore_times = 0;
-@@ -309,7 +310,7 @@ void usage(enum logcode F)
+@@ -308,7 +309,7 @@ void usage(enum logcode F)
  
  enum {OPT_VERSION = 1000, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
        OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED, OPT_LINK_DEST,
@@ -584,7 +584,7 @@ contained a slash.
        OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT,
        OPT_REFUSED_BASE = 9000};
  
-@@ -334,6 +335,7 @@ static struct poptOption long_options[] 
+@@ -333,6 +334,7 @@ static struct poptOption long_options[] 
    {"include",          0,  POPT_ARG_STRING, 0,              OPT_INCLUDE, 0, 0 },
    {"exclude-from",     0,  POPT_ARG_STRING, 0,              OPT_EXCLUDE_FROM, 0, 0 },
    {"include-from",     0,  POPT_ARG_STRING, 0,              OPT_INCLUDE_FROM, 0, 0 },
@@ -592,7 +592,7 @@ contained a slash.
    {"safe-links",       0,  POPT_ARG_NONE,   &safe_symlinks, 0, 0, 0 },
    {"help",            'h', POPT_ARG_NONE,   0,              'h', 0, 0 },
    {"backup",          'b', POPT_ARG_NONE,   &make_backups, 0, 0, 0 },
-@@ -542,6 +544,31 @@ int parse_arguments(int *argc, const cha
+@@ -541,6 +543,31 @@ int parse_arguments(int *argc, const cha
                                         XFLG_FATAL_ERRORS | XFLG_DEF_INCLUDE);
                        break;
  
@@ -624,7 +624,7 @@ contained a slash.
                case 'h':
                        usage(FINFO);
                        exit_cleanup(0);
-@@ -771,6 +798,9 @@ int parse_arguments(int *argc, const cha
+@@ -770,6 +797,9 @@ int parse_arguments(int *argc, const cha
                }
        }
  
@@ -634,7 +634,7 @@ contained a slash.
        return 1;
  }
  
-@@ -872,6 +902,12 @@ void server_options(char **args,int *arg
+@@ -871,6 +901,12 @@ void server_options(char **args,int *arg
        if (x != 1)
                args[ac++] = argstr;
  
@@ -647,8 +647,8 @@ contained a slash.
        if (block_size) {
                if (asprintf(&arg, "-B%u", block_size) < 0)
                        goto oom;
---- rsync.h    16 May 2004 07:28:24 -0000      1.204
-+++ rsync.h    11 Jun 2004 07:55:59 -0000
+--- orig/rsync.h       2004-07-07 08:27:00
++++ rsync.h    2004-07-03 20:21:27
 @@ -108,6 +108,7 @@
  #define XFLG_DEF_INCLUDE      (1<<1)
  #define XFLG_WORDS_ONLY       (1<<2)
@@ -675,8 +675,8 @@ contained a slash.
  };
  
  struct exclude_list_struct {
---- rsync.yo   5 Jun 2004 16:16:30 -0000       1.171
-+++ rsync.yo   11 Jun 2004 07:56:00 -0000
+--- orig/rsync.yo      2004-07-15 02:21:11
++++ rsync.yo   2004-07-03 20:21:27
 @@ -332,6 +332,7 @@ verb(
       --exclude-from=FILE     exclude patterns listed in FILE
       --include=PATTERN       don't exclude files matching PATTERN
@@ -714,7 +714,7 @@ contained a slash.
  dit(bf(--files-from=FILE)) Using this option allows you to specify the
  exact list of files to transfer (as read from the specified FILE or "-"
  for stdin).  It also tweaks the default behavior of rsync to make
-@@ -1043,6 +1066,11 @@ itemize(
+@@ -1039,6 +1062,11 @@ itemize(
    then it is always considered an exclude pattern, even if specified as
    part of an include option. The prefix is discarded before matching.
  
@@ -726,7 +726,7 @@ contained a slash.
    it() if the pattern is a single exclamation mark ! then the current
    include/exclude list is reset, removing all previously defined patterns.
  )
-@@ -1095,6 +1123,67 @@ itemize(
+@@ -1091,6 +1119,67 @@ itemize(
    it would be excluded by the "*")
  )
  
@@ -794,8 +794,8 @@ contained a slash.
  manpagesection(BATCH MODE)
  
  bf(Note:) Batch mode should be considered experimental in this version
---- testsuite/exclude.test     24 May 2004 00:16:07 -0000      1.8
-+++ testsuite/exclude.test     11 Jun 2004 07:56:00 -0000
+--- orig/testsuite/exclude.test        2004-05-29 21:25:45
++++ testsuite/exclude.test     2004-07-03 20:21:27
 @@ -23,19 +23,47 @@ export HOME CVSIGNORE
  makepath "$fromdir/foo/down/to/you"
  makepath "$fromdir/bar/down/to/foo/too"