Updated patches to work with the current trunk.

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

diff --git a/transliterate.diff b/transliterate.diff
index 77f9ed8..2dc0e8b 100644 (file)
--- a/transliterate.diff
+++ b/transliterate.diff
@@ -13,11 +13,11 @@ To use this patch, run these commands for a successful build:
     ./configure                                 (optional if already run)
     make
 
-based-on: 24079e988fc31af4eba56cd2701fdc5a4154980d
+based-on: a01e3b490eb36ccf9e704840e1b6683dab867550
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c
-@@ -86,6 +86,9 @@ extern int filesfrom_convert;
+@@ -88,6 +88,9 @@ extern int filesfrom_convert;
  extern iconv_t ic_send, ic_recv;
  #endif
  
@@ -27,7 +27,7 @@ diff --git a/flist.c b/flist.c
  #ifdef HAVE_UTIMENSAT
  #ifdef HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC
  #define ST_MTIME_NSEC st_mtim.tv_nsec
-@@ -673,6 +676,24 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
+@@ -675,6 +678,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 @@ diff --git a/flist.c b/flist.c
  static struct file_struct *recv_file_entry(int f, struct file_list *flist, int xflags)
  {
        static int64 modtime;
-@@ -741,6 +762,9 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
+@@ -743,6 +764,9 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
        }
  #endif
  
@@ -90,7 +90,7 @@ diff --git a/options.c b/options.c
    {"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 },
-@@ -2232,6 +2236,31 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -2247,6 +2251,31 @@ int parse_arguments(int *argc_p, const char ***argv_p)
                }
        }
  
@@ -122,7 +122,7 @@ diff --git a/options.c b/options.c
        am_starting_up = 0;
  
        return 1;
-@@ -2646,6 +2675,12 @@ void server_options(char **args, int *argc_p)
+@@ -2661,6 +2690,12 @@ void server_options(char **args, int *argc_p)
        else if (remove_source_files)
                args[ac++] = "--remove-sent-files";
  
@@ -146,7 +146,7 @@ diff --git a/rsync.yo b/rsync.yo
       --checksum-seed=NUM     set block/file checksum seed (advanced)
   -4, --ipv4                  prefer IPv4
   -6, --ipv6                  prefer IPv6
-@@ -2359,6 +2360,22 @@ daemon uses the charset specified in its "charset" configuration parameter
+@@ -2373,6 +2374,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)).