The patches for 3.0.0pre6.

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

diff --git a/downdate.diff b/downdate.diff
index 08598d1..5ef63b1 100644 (file)
--- a/downdate.diff
+++ b/downdate.diff
@@ -7,8 +7,9 @@ To use this patch, run these commands for a successful build:
     ./configure                                 (optional if already run)
     make
 
---- old/generator.c
-+++ new/generator.c
+diff --git a/generator.c b/generator.c
+--- a/generator.c
++++ b/generator.c
 @@ -54,6 +54,7 @@ extern int ignore_errors;
  extern int remove_source_files;
  extern int delay_updates;
@@ -17,7 +18,7 @@ To use this patch, run these commands for a successful build:
  extern int ignore_existing;
  extern int ignore_non_existing;
  extern int inplace;
-@@ -1528,6 +1529,13 @@ static void recv_generator(char *fname, 
+@@ -1603,6 +1604,13 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                goto cleanup;
        }
  
@@ -31,7 +32,7 @@ To use this patch, run these commands for a successful build:
        fnamecmp = fname;
        fnamecmp_type = FNAMECMP_FNAME;
  
-@@ -1825,6 +1833,7 @@ void check_for_finished_files(int itemiz
+@@ -1917,6 +1925,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;
@@ -39,7 +40,7 @@ To use this patch, run these commands for a successful build:
                always_checksum = -always_checksum;
                size_only = -size_only;
                append_mode = -append_mode;
-@@ -1850,6 +1859,7 @@ void check_for_finished_files(int itemiz
+@@ -1942,6 +1951,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;
@@ -47,9 +48,10 @@ To use this patch, run these commands for a successful build:
                always_checksum = -always_checksum;
                size_only = -size_only;
                append_mode = -append_mode;
---- old/options.c
-+++ new/options.c
-@@ -57,6 +57,7 @@ int preserve_uid = 0;
+diff --git a/options.c b/options.c
+--- a/options.c
++++ b/options.c
+@@ -58,6 +58,7 @@ int preserve_uid = 0;
  int preserve_gid = 0;
  int preserve_times = 0;
  int update_only = 0;
@@ -57,7 +59,7 @@ To use this patch, run these commands for a successful build:
  int cvs_exclude = 0;
  int dry_run = 0;
  int do_xfers = 1;
-@@ -318,6 +319,7 @@ void usage(enum logcode F)
+@@ -320,6 +321,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");
@@ -65,7 +67,7 @@ To use this patch, run these commands for a successful build:
    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");
-@@ -522,6 +524,7 @@ static struct poptOption long_options[] 
+@@ -524,6 +526,7 @@ static struct poptOption long_options[] = {
    {"size-only",        0,  POPT_ARG_NONE,   &size_only, 0, 0, 0 },
    {"one-file-system", 'x', POPT_ARG_NONE,   0, 'x', 0, 0 },
    {"update",          'u', POPT_ARG_NONE,   &update_only, 0, 0, 0 },