The patches for 3.3.0.

[rsync-patches.git] / ignore-case.diff

diff --git a/ignore-case.diff b/ignore-case.diff
index e4493d7e7e74676a01f8fd0eaca07febdb4318ad..97b36b5b2162096c2aedefb6947db59343e8d407 100644 (file)
--- a/ignore-case.diff
+++ b/ignore-case.diff
@@ -12,11 +12,11 @@ TODO:
  - Make this code handle multibyte character encodings, and honor the
    --iconv setting when converting case.
 
-based-on: 00dd50a00c00da4824b3aa5fe2b2f82baffca071
+based-on: 6c8ca91c731b7bf2b081694bda85b7dadc2b7aff
 diff --git a/exclude.c b/exclude.c
 --- a/exclude.c
 +++ b/exclude.c
-@@ -684,16 +684,15 @@ static int rule_matches(const char *fname, filter_rule *ex, int name_flags)
+@@ -966,16 +966,15 @@ static int rule_matches(const char *fname, filter_rule *ex, int name_flags)
                if (litmatch_array(pattern, strings, slash_handling))
                        return ret_match;
        } else if (anchored_match) {
@@ -40,15 +40,15 @@ diff --git a/exclude.c b/exclude.c
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c
-@@ -35,6 +35,7 @@ extern int inc_recurse;
+@@ -34,6 +34,7 @@ extern int am_generator;
+ extern int inc_recurse;
  extern int always_checksum;
- extern int checksum_type;
  extern int module_id;
 +extern int ignore_case;
  extern int ignore_errors;
  extern int numeric_ids;
  extern int quiet;
-@@ -2538,7 +2539,8 @@ struct file_list *recv_file_list(int f, int dir_ndx)
+@@ -2638,7 +2639,8 @@ struct file_list *recv_file_list(int f, int dir_ndx)
                                cur_dir++;
                        if (cur_dir != good_dirname) {
                                const char *d = dir_ndx >= 0 ? f_name(dir_flist->files[dir_ndx], NULL) : empty_dir;
@@ -58,7 +58,7 @@ diff --git a/flist.c b/flist.c
                                        rprintf(FERROR,
                                                "ABORTING due to invalid path from sender: %s/%s\n",
                                                cur_dir, file->basename);
-@@ -3111,6 +3113,7 @@ int f_name_cmp(const struct file_struct *f1, const struct file_struct *f2)
+@@ -3205,6 +3207,7 @@ int f_name_cmp(const struct file_struct *f1, const struct file_struct *f2)
  {
        int dif;
        const uchar *c1, *c2;
@@ -66,7 +66,7 @@ diff --git a/flist.c b/flist.c
        enum fnc_state state1, state2;
        enum fnc_type type1, type2;
        enum fnc_type t_path = protocol_version >= 29 ? t_PATH : t_ITEM;
-@@ -3221,7 +3224,15 @@ int f_name_cmp(const struct file_struct *f1, const struct file_struct *f2)
+@@ -3315,7 +3318,15 @@ int f_name_cmp(const struct file_struct *f1, const struct file_struct *f2)
                        if (type1 != type2)
                                return type1 == t_PATH ? 1 : -1;
                }
@@ -86,7 +86,7 @@ diff --git a/flist.c b/flist.c
 diff --git a/ifuncs.h b/ifuncs.h
 --- a/ifuncs.h
 +++ b/ifuncs.h
-@@ -109,3 +109,38 @@ static inline char *my_strdup(const char *str, const char *file, int line)
+@@ -110,3 +110,38 @@ static inline char *my_strdup(const char *str, const char *file, int line)
      memcpy(buf, str, len);
      return buf;
  }
@@ -214,7 +214,7 @@ diff --git a/lib/wildmatch.c b/lib/wildmatch.c
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
-@@ -124,6 +124,7 @@ OFF_T max_size = -1;
+@@ -131,6 +131,7 @@ OFF_T max_size = -1;
  OFF_T min_size = -1;
  int ignore_errors = 0;
  int modify_window = 0;
@@ -222,7 +222,7 @@ diff --git a/options.c b/options.c
  int blocking_io = -1;
  int checksum_seed = 0;
  int inplace = 0;
-@@ -979,6 +980,8 @@ static struct poptOption long_options[] = {
+@@ -784,6 +785,8 @@ static struct poptOption long_options[] = {
    {"read-batch",       0,  POPT_ARG_STRING, &batch_name, OPT_READ_BATCH, 0, 0 },
    {"write-batch",      0,  POPT_ARG_STRING, &batch_name, OPT_WRITE_BATCH, 0, 0 },
    {"only-write-batch", 0,  POPT_ARG_STRING, &batch_name, OPT_ONLY_WRITE_BATCH, 0, 0 },
@@ -231,7 +231,7 @@ diff --git a/options.c b/options.c
    {"files-from",       0,  POPT_ARG_STRING, &files_from, 0, 0, 0 },
    {"from0",           '0', POPT_ARG_VAL,    &eol_nulls, 1, 0, 0},
    {"no-from0",         0,  POPT_ARG_VAL,    &eol_nulls, 0, 0, 0},
-@@ -2796,6 +2799,9 @@ void server_options(char **args, int *argc_p)
+@@ -2865,6 +2868,9 @@ void server_options(char **args, int *argc_p)
                args[ac++] = arg;
        }
  
@@ -244,15 +244,15 @@ diff --git a/options.c b/options.c
 diff --git a/rsync.1.md b/rsync.1.md
 --- a/rsync.1.md
 +++ b/rsync.1.md
-@@ -438,6 +438,7 @@ detailed description below for a complete description.
- --from0, -0              all *-from/filter files are delimited by 0s
- --protect-args, -s       no space-splitting; wildcard chars only
+@@ -528,6 +528,7 @@ has its own detailed description later in this manpage.
+ --secluded-args, -s      use the protocol to safely send the args
+ --trust-sender           trust the remote sender's file list
  --copy-as=USER[:GROUP]   specify user & optional group for the copy
 +--ignore-case            ignore case when comparing filenames
  --address=ADDRESS        bind address for outgoing socket to daemon
  --port=PORT              specify double-colon alternate port number
  --sockopts=OPTIONS       specify custom TCP options
-@@ -2148,6 +2149,12 @@ your home directory (remove the '=' for that).
+@@ -2583,6 +2584,12 @@ expand it.
  
      >     sudo rsync -aive lsh -M--copy-as=joe src/ lh:dest/
  
@@ -268,12 +268,12 @@ diff --git a/rsync.1.md b/rsync.1.md
 diff --git a/t_stub.c b/t_stub.c
 --- a/t_stub.c
 +++ b/t_stub.c
-@@ -33,6 +33,7 @@ int preserve_xattrs = 0;
- int preserve_perms = 0;
+@@ -34,6 +34,7 @@ int preserve_perms = 0;
  int preserve_executability = 0;
+ int omit_link_times = 0;
  int open_noatime = 0;
 +int ignore_case = 0;
- size_t max_alloc = 1024*1024*1024; /* max_alloc is needed when combined with util2.o */
+ size_t max_alloc = 0; /* max_alloc is needed when combined with util2.o */
  char *partial_dir;
  char *module_dir;
 diff --git a/wildtest.c b/wildtest.c