Updated patches to work with the current trunk.

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

diff --git a/downdate.diff b/downdate.diff
index fae61b1..af9e881 100644 (file)
--- a/downdate.diff
+++ b/downdate.diff
@@ -7,8 +7,8 @@ To use this patch, run these commands for a successful build:
     ./configure                                 (optional if already run)
     make
 
+based-on: 24079e988fc31af4eba56cd2701fdc5a4154980d
 diff --git a/generator.c b/generator.c
-index 12007a1..f326030 100644
 --- a/generator.c
 +++ b/generator.c
 @@ -56,6 +56,7 @@ extern int ignore_errors;
@@ -19,7 +19,7 @@ index 12007a1..f326030 100644
  extern int human_readable;
  extern int ignore_existing;
  extern int ignore_non_existing;
-@@ -1542,6 +1543,13 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1530,6 +1531,13 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                goto cleanup;
        }
  
@@ -33,7 +33,7 @@ index 12007a1..f326030 100644
        fnamecmp = fname;
        fnamecmp_type = FNAMECMP_FNAME;
  
-@@ -1913,6 +1921,7 @@ void check_for_finished_files(int itemizing, enum logcode code, int check_redo)
+@@ -1963,6 +1971,7 @@ void check_for_finished_files(int itemizing, enum logcode code, int check_redo)
                        ignore_existing = -ignore_existing;
                        ignore_non_existing = -ignore_non_existing;
                        update_only = -update_only;
@@ -41,7 +41,7 @@ index 12007a1..f326030 100644
                        always_checksum = -always_checksum;
                        size_only = -size_only;
                        append_mode = -append_mode;
-@@ -1938,6 +1947,7 @@ void check_for_finished_files(int itemizing, enum logcode code, int check_redo)
+@@ -1988,6 +1997,7 @@ void check_for_finished_files(int itemizing, enum logcode code, int check_redo)
                        ignore_existing = -ignore_existing;
                        ignore_non_existing = -ignore_non_existing;
                        update_only = -update_only;
@@ -50,7 +50,6 @@ index 12007a1..f326030 100644
                        size_only = -size_only;
                        append_mode = -append_mode;
 diff --git a/options.c b/options.c
-index e7c6c61..371d72f 100644
 --- a/options.c
 +++ b/options.c
 @@ -60,6 +60,7 @@ int preserve_uid = 0;
@@ -61,7 +60,7 @@ index e7c6c61..371d72f 100644
  int cvs_exclude = 0;
  int dry_run = 0;
  int do_xfers = 1;
-@@ -670,6 +671,7 @@ void usage(enum logcode F)
+@@ -671,6 +672,7 @@ void usage(enum logcode F)
    rprintf(F,"     --backup-dir=DIR        make backups into hierarchy based in DIR\n");
    rprintf(F,"     --suffix=SUFFIX         set backup suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX);
    rprintf(F," -u, --update                skip files that are newer on the receiver\n");
@@ -69,7 +68,7 @@ index e7c6c61..371d72f 100644
    rprintf(F,"     --inplace               update destination files in-place (SEE MAN PAGE)\n");
    rprintf(F,"     --append                append data onto shorter files\n");
    rprintf(F,"     --append-verify         like --append, but with old data in file checksum\n");
-@@ -891,6 +893,7 @@ static struct poptOption long_options[] = {
+@@ -892,6 +894,7 @@ static struct poptOption long_options[] = {
    {"no-one-file-system",'x',POPT_ARG_VAL,   &one_file_system, 0, 0, 0 },
    {"no-x",            'x', POPT_ARG_VAL,    &one_file_system, 0, 0, 0 },
    {"update",          'u', POPT_ARG_NONE,   &update_only, 0, 0, 0 },