Adding filter-attribute-mods patch; updating patches.

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

diff --git a/transliterate.diff b/transliterate.diff
index c2fcc6b..e812840 100644 (file)
--- a/transliterate.diff
+++ b/transliterate.diff
@@ -13,8 +13,8 @@ To use this patch, run these commands for a successful build:
     ./configure                                 (optional if already run)
     make
 
+based-on: 181c9faf928faad08ef095f4667afe460ec3bef6
 diff --git a/flist.c b/flist.c
-index 09b4fc5..f69167e 100644
 --- a/flist.c
 +++ b/flist.c
 @@ -87,6 +87,9 @@ extern int filesfrom_convert;
@@ -27,7 +27,7 @@ index 09b4fc5..f69167e 100644
  #define PTR_SIZE (sizeof (struct file_struct *))
  
  int io_error;
-@@ -651,6 +654,24 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
+@@ -661,6 +664,24 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
                stats.total_size += F_LENGTH(file);
  }
  
@@ -52,7 +52,7 @@ index 09b4fc5..f69167e 100644
  static struct file_struct *recv_file_entry(struct file_list *flist,
                                           int xflags, int f)
  {
-@@ -719,6 +740,9 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
+@@ -729,6 +750,9 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
        }
  #endif
  
@@ -63,7 +63,6 @@ index 09b4fc5..f69167e 100644
                clean_fname(thisname, 0);
  
 diff --git a/options.c b/options.c
-index e7c6c61..cd0891c 100644
 --- a/options.c
 +++ b/options.c
 @@ -190,6 +190,8 @@ int logfile_format_has_i = 0;
@@ -91,7 +90,7 @@ index e7c6c61..cd0891c 100644
    {"ipv4",            '4', POPT_ARG_VAL,    &default_af_hint, AF_INET, 0, 0 },
    {"ipv6",            '6', POPT_ARG_VAL,    &default_af_hint, AF_INET6, 0, 0 },
    {"8-bit-output",    '8', POPT_ARG_VAL,    &allow_8bit_chars, 1, 0, 0 },
-@@ -2195,6 +2199,31 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -2212,6 +2216,31 @@ int parse_arguments(int *argc_p, const char ***argv_p)
                }
        }
  
@@ -123,7 +122,7 @@ index e7c6c61..cd0891c 100644
        am_starting_up = 0;
  
        return 1;
-@@ -2609,6 +2638,12 @@ void server_options(char **args, int *argc_p)
+@@ -2626,6 +2655,12 @@ void server_options(char **args, int *argc_p)
        else if (remove_source_files)
                args[ac++] = "--remove-sent-files";
  
@@ -137,7 +136,6 @@ index e7c6c61..cd0891c 100644
                rprintf(FERROR, "argc overflow in server_options().\n");
                exit_cleanup(RERR_MALLOC);
 diff --git a/rsync.yo b/rsync.yo
-index 941f7a5..dda8608 100644
 --- a/rsync.yo
 +++ b/rsync.yo
 @@ -436,6 +436,7 @@ to the detailed description below for a complete description.  verb(
@@ -148,7 +146,7 @@ index 941f7a5..dda8608 100644
       --checksum-seed=NUM     set block/file checksum seed (advanced)
   -4, --ipv4                  prefer IPv4
   -6, --ipv6                  prefer IPv6
-@@ -2294,6 +2295,22 @@ daemon uses the charset specified in its "charset" configuration parameter
+@@ -2321,6 +2322,22 @@ daemon uses the charset specified in its "charset" configuration parameter
  regardless of the remote charset you actually pass.  Thus, you may feel free to
  specify just the local charset for a daemon transfer (e.g. bf(--iconv=utf8)).