The patches for 3.1.1pre1.

[rsync-patches.git] / downdate.diff

diff --git a/downdate.diff b/downdate.diff
index 4d6516b9f4011dcdc047a66b78e2f102cf7e2294..d98e67b10df57aee76f0434bc35307f9555d0fea 100644 (file)
--- a/downdate.diff
+++ b/downdate.diff
@@ -7,11 +7,11 @@ To use this patch, run these commands for a successful build:
     ./configure                                 (optional if already run)
     make
 
-based-on: d64bda1c1e79dc385f194d74f7957ce7cd118654
+based-on: 8946cfc6f8018e30740ee1db4cc2e2008e4f7e7e
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c
-@@ -56,6 +56,7 @@ extern int ignore_errors;
+@@ -54,6 +54,7 @@ extern int ignore_errors;
  extern int remove_source_files;
  extern int delay_updates;
  extern int update_only;
@@ -19,7 +19,7 @@ diff --git a/generator.c b/generator.c
  extern int human_readable;
  extern int ignore_existing;
  extern int ignore_non_existing;
-@@ -1532,6 +1533,13 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1657,6 +1658,13 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                goto cleanup;
        }
  
@@ -30,10 +30,10 @@ diff --git a/generator.c b/generator.c
 +              return;
 +      }
 +
-       fnamecmp = fname;
        fnamecmp_type = FNAMECMP_FNAME;
  
-@@ -1965,6 +1973,7 @@ void check_for_finished_files(int itemizing, enum logcode code, int check_redo)
+       if (statret == 0 && !S_ISREG(sx.st.st_mode)) {
+@@ -2082,6 +2090,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 @@ diff --git a/generator.c b/generator.c
                        always_checksum = -always_checksum;
                        size_only = -size_only;
                        append_mode = -append_mode;
-@@ -1990,6 +1999,7 @@ void check_for_finished_files(int itemizing, enum logcode code, int check_redo)
+@@ -2107,6 +2116,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;
@@ -60,7 +60,7 @@ diff --git a/options.c b/options.c
  int cvs_exclude = 0;
  int dry_run = 0;
  int do_xfers = 1;
-@@ -672,6 +673,7 @@ void usage(enum logcode F)
+@@ -680,6 +681,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");
@@ -68,7 +68,7 @@ diff --git a/options.c b/options.c
    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");
-@@ -897,6 +899,7 @@ static struct poptOption long_options[] = {
+@@ -914,6 +916,7 @@ static struct poptOption long_options[] = {
    {"no-one-file-system",0, POPT_ARG_VAL,    &one_file_system, 0, 0, 0 },
    {"no-x",             0,  POPT_ARG_VAL,    &one_file_system, 0, 0, 0 },
    {"update",          'u', POPT_ARG_NONE,   &update_only, 0, 0, 0 },