Making backup-dir-dels depend on backup-deleted.

[rsync-patches.git] / transliterate.diff

diff --git a/transliterate.diff b/transliterate.diff
index 05ef8e15a9bffa2ca5fee95a8a200af279d57307..e07e8fb24b092eb1bab96833f38c668ede82fe30 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: 3b8f8192227b14e708bf535072485e50f4362270
+based-on: 28b519c93b6db30b6520d46f8cd65160213fddd2
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c
-@@ -87,6 +87,9 @@ extern int filesfrom_convert;
+@@ -86,6 +86,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
-@@ -674,6 +677,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;
-@@ -742,6 +763,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
  
@@ -65,7 +65,7 @@ diff --git a/flist.c b/flist.c
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
-@@ -190,6 +190,8 @@ int logfile_format_has_i = 0;
+@@ -191,6 +191,8 @@ int logfile_format_has_i = 0;
  int logfile_format_has_o_or_i = 0;
  int always_checksum = 0;
  int list_only = 0;
@@ -74,7 +74,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;
-@@ -783,6 +785,7 @@ void usage(enum logcode F)
+@@ -795,6 +797,7 @@ void usage(enum logcode F)
  #ifdef ICONV_OPTION
    rprintf(F,"     --iconv=CONVERT_SPEC    request charset conversion of filenames\n");
  #endif
@@ -82,7 +82,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");
-@@ -996,6 +999,7 @@ static struct poptOption long_options[] = {
+@@ -1012,6 +1015,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
@@ -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 },
-@@ -2213,6 +2217,31 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -2271,6 +2275,31 @@ int parse_arguments(int *argc_p, const char ***argv_p)
                }
        }
  
@@ -122,9 +122,9 @@ diff --git a/options.c b/options.c
        am_starting_up = 0;
  
        return 1;
-@@ -2627,6 +2656,12 @@ void server_options(char **args, int *argc_p)
-       else if (remove_source_files)
-               args[ac++] = "--remove-sent-files";
+@@ -2682,6 +2711,12 @@ void server_options(char **args, int *argc_p)
+       if (fuzzy_basis && am_sender)
+               args[ac++] = "--fuzzy";
  
 +      if (tr_opt) {
 +              if (asprintf(&arg, "--tr=%s", tr_opt) < 0)
@@ -132,13 +132,13 @@ diff --git a/options.c b/options.c
 +              args[ac++] = arg;
 +      }
 +
-       if (ac > MAX_SERVER_ARGS) { /* Not possible... */
-               rprintf(FERROR, "argc overflow in server_options().\n");
-               exit_cleanup(RERR_MALLOC);
+       if (remove_source_files == 1)
+               args[ac++] = "--remove-source-files";
+       else if (remove_source_files)
 diff --git a/rsync.yo b/rsync.yo
 --- a/rsync.yo
 +++ b/rsync.yo
-@@ -436,6 +436,7 @@ to the detailed description below for a complete description.  verb(
+@@ -438,6 +438,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
@@ -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
-@@ -2344,6 +2345,22 @@ daemon uses the charset specified in its "charset" configuration parameter
+@@ -2469,6 +2470,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)).