Fixed compilation errors/warnings.

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

diff --git a/downdate.diff b/downdate.diff
index 3484b20..08598d1 100644 (file)
--- a/downdate.diff
+++ b/downdate.diff
@@ -17,12 +17,12 @@ To use this patch, run these commands for a successful build:
  extern int ignore_existing;
  extern int ignore_non_existing;
  extern int inplace;
-@@ -1513,6 +1514,13 @@ static void recv_generator(char *fname, 
+@@ -1528,6 +1529,13 @@ static void recv_generator(char *fname, 
                goto cleanup;
        }
  
 +      if (downdate_only && statret == 0
-+          && cmp_time(st.st_mtime, file->modtime) < 0) {
++          && cmp_time(sx.st.st_mtime, file->modtime) < 0) {
 +              if (verbose > 1)
 +                      rprintf(FINFO, "%s is older\n", fname);
 +              return;
@@ -31,7 +31,7 @@ To use this patch, run these commands for a successful build:
        fnamecmp = fname;
        fnamecmp_type = FNAMECMP_FNAME;
  
-@@ -1806,6 +1814,7 @@ void check_for_finished_files(int itemiz
+@@ -1825,6 +1833,7 @@ void check_for_finished_files(int itemiz
                ignore_existing = -ignore_existing;
                ignore_non_existing = -ignore_non_existing;
                update_only = -update_only;
@@ -39,7 +39,7 @@ To use this patch, run these commands for a successful build:
                always_checksum = -always_checksum;
                size_only = -size_only;
                append_mode = -append_mode;
-@@ -1831,6 +1840,7 @@ void check_for_finished_files(int itemiz
+@@ -1850,6 +1859,7 @@ void check_for_finished_files(int itemiz
                ignore_existing = -ignore_existing;
                ignore_non_existing = -ignore_non_existing;
                update_only = -update_only;
@@ -57,7 +57,7 @@ To use this patch, run these commands for a successful build:
  int cvs_exclude = 0;
  int dry_run = 0;
  int do_xfers = 1;
-@@ -317,6 +318,7 @@ void usage(enum logcode F)
+@@ -318,6 +319,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 +65,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");
-@@ -517,6 +519,7 @@ static struct poptOption long_options[] 
+@@ -522,6 +524,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 },