Updated patches to work with the current trunk.

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

diff --git a/transliterate.diff b/transliterate.diff
index 68bc269..c2fcc6b 100644 (file)
--- a/transliterate.diff
+++ b/transliterate.diff
@@ -14,9 +14,10 @@ To use this patch, run these commands for a successful build:
     make
 
 diff --git a/flist.c b/flist.c
+index 09b4fc5..f69167e 100644
 --- a/flist.c
 +++ b/flist.c
-@@ -84,6 +84,9 @@ extern int filesfrom_convert;
+@@ -87,6 +87,9 @@ extern int filesfrom_convert;
  extern iconv_t ic_send, ic_recv;
  #endif
  
@@ -26,7 +27,7 @@ diff --git a/flist.c b/flist.c
  #define PTR_SIZE (sizeof (struct file_struct *))
  
  int io_error;
-@@ -619,6 +622,24 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
+@@ -651,6 +654,24 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
                stats.total_size += F_LENGTH(file);
  }
  
@@ -51,7 +52,7 @@ diff --git a/flist.c b/flist.c
  static struct file_struct *recv_file_entry(struct file_list *flist,
                                           int xflags, int f)
  {
-@@ -687,6 +708,9 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
+@@ -719,6 +740,9 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
        }
  #endif
  
@@ -62,9 +63,10 @@ diff --git a/flist.c b/flist.c
                clean_fname(thisname, 0);
  
 diff --git a/options.c b/options.c
+index e7c6c61..cd0891c 100644
 --- a/options.c
 +++ b/options.c
-@@ -184,6 +184,8 @@ int logfile_format_has_i = 0;
+@@ -190,6 +190,8 @@ int logfile_format_has_i = 0;
  int logfile_format_has_o_or_i = 0;
  int always_checksum = 0;
  int list_only = 0;
@@ -73,7 +75,7 @@ diff --git a/options.c b/options.c
  
  #define MAX_BATCH_NAME_LEN 256        /* Must be less than MAXPATHLEN-13 */
  char *batch_name = NULL;
-@@ -432,6 +434,7 @@ void usage(enum logcode F)
+@@ -782,6 +784,7 @@ void usage(enum logcode F)
  #ifdef ICONV_OPTION
    rprintf(F,"     --iconv=CONVERT_SPEC    request charset conversion of filenames\n");
  #endif
@@ -81,7 +83,7 @@ diff --git a/options.c b/options.c
    rprintf(F," -4, --ipv4                  prefer IPv4\n");
    rprintf(F," -6, --ipv6                  prefer IPv6\n");
    rprintf(F,"     --version               print version number\n");
-@@ -634,6 +637,7 @@ static struct poptOption long_options[] = {
+@@ -995,6 +998,7 @@ static struct poptOption long_options[] = {
    {"iconv",            0,  POPT_ARG_STRING, &iconv_opt, 0, 0, 0 },
    {"no-iconv",         0,  POPT_ARG_NONE,   0, OPT_NO_ICONV, 0, 0 },
  #endif
@@ -89,7 +91,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 },
-@@ -1681,6 +1685,31 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -2195,6 +2199,31 @@ int parse_arguments(int *argc_p, const char ***argv_p)
                }
        }
  
@@ -121,7 +123,7 @@ diff --git a/options.c b/options.c
        am_starting_up = 0;
  
        return 1;
-@@ -2063,6 +2092,12 @@ void server_options(char **args, int *argc_p)
+@@ -2609,6 +2638,12 @@ void server_options(char **args, int *argc_p)
        else if (remove_source_files)
                args[ac++] = "--remove-sent-files";
  
@@ -135,9 +137,10 @@ diff --git a/options.c b/options.c
                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
-@@ -427,6 +427,7 @@ to the detailed description below for a complete description.  verb(
+@@ -436,6 +436,7 @@ to the detailed description below for a complete description.  verb(
       --read-batch=FILE       read a batched update from FILE
       --protocol=NUM          force an older protocol version to be used
       --iconv=CONVERT_SPEC    request charset conversion of filenames
@@ -145,7 +148,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
-@@ -2093,6 +2094,22 @@ daemon uses the charset specified in its "charset" configuration parameter
+@@ -2294,6 +2295,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)).