Updated patches to work with the current trunk.

[rsync/rsync-patches.git] / date-only.diff

diff --git a/date-only.diff b/date-only.diff
index 693e017..0349f87 100644 (file)
--- a/date-only.diff
+++ b/date-only.diff
@@ -15,9 +15,10 @@ To use this patch, run these commands for a successful build:
     make
 
 diff --git a/generator.c b/generator.c
+index 12007a1..a2519e6 100644
 --- a/generator.c
 +++ b/generator.c
-@@ -62,6 +62,7 @@ extern int append_mode;
+@@ -64,6 +64,7 @@ extern int append_mode;
  extern int make_backups;
  extern int csum_length;
  extern int ignore_times;
@@ -25,7 +26,7 @@ diff --git a/generator.c b/generator.c
  extern int size_only;
  extern OFF_T max_size;
  extern OFF_T min_size;
-@@ -717,6 +718,9 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
+@@ -524,6 +525,9 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
  /* Perform our quick-check heuristic for determining if a file is unchanged. */
  int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
  {
@@ -36,25 +37,26 @@ diff --git a/generator.c b/generator.c
                return 0;
  
 diff --git a/options.c b/options.c
+index e7c6c61..b317903 100644
 --- a/options.c
 +++ b/options.c
-@@ -106,6 +106,7 @@ int keep_partial = 0;
- int safe_symlinks = 0;
+@@ -105,6 +105,7 @@ int safe_symlinks = 0;
  int copy_unsafe_links = 0;
+ int munge_symlinks = 0;
  int size_only = 0;
 +int date_only = 0;
  int daemon_bwlimit = 0;
  int bwlimit = 0;
  int fuzzy_basis = 0;
-@@ -389,6 +390,7 @@ void usage(enum logcode F)
-   rprintf(F,"     --contimeout=SECONDS    set daemon connection timeout in seconds\n");
+@@ -739,6 +740,7 @@ void usage(enum logcode F)
    rprintf(F," -I, --ignore-times          don't skip files that match in size and mod-time\n");
+   rprintf(F," -M, --remote-option=OPTION  send OPTION to the remote side only\n");
    rprintf(F,"     --size-only             skip files that match in size\n");
 +  rprintf(F,"     --date-only             skip files that match in mod-time\n");
    rprintf(F,"     --modify-window=NUM     compare mod-times with reduced accuracy\n");
    rprintf(F," -T, --temp-dir=DIR          create temporary files in directory DIR\n");
    rprintf(F," -y, --fuzzy                 find similar file for basis if no dest file\n");
-@@ -531,6 +533,7 @@ static struct poptOption long_options[] = {
+@@ -887,6 +889,7 @@ static struct poptOption long_options[] = {
    {"chmod",            0,  POPT_ARG_STRING, 0, OPT_CHMOD, 0, 0 },
    {"ignore-times",    'I', POPT_ARG_NONE,   &ignore_times, 0, 0, 0 },
    {"size-only",        0,  POPT_ARG_NONE,   &size_only, 0, 0, 0 },
@@ -62,9 +64,9 @@ diff --git a/options.c b/options.c
    {"one-file-system", 'x', POPT_ARG_NONE,   0, 'x', 0, 0 },
    {"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 },
-@@ -1969,6 +1972,9 @@ void server_options(char **args, int *argc_p)
-               }
-       }
+@@ -2493,6 +2496,9 @@ void server_options(char **args, int *argc_p)
+       else if (missing_args == 1 && !am_sender)
+               args[ac++] = "--ignore-missing-args";
  
 +      if (date_only)
 +              args[ac++] = "--date-only";
@@ -73,9 +75,10 @@ diff --git a/options.c b/options.c
                if (asprintf(&arg, "--modify-window=%d", modify_window) < 0)
                        goto oom;
 diff --git a/rsync.yo b/rsync.yo
+index 941f7a5..710b32d 100644
 --- a/rsync.yo
 +++ b/rsync.yo
-@@ -386,6 +386,7 @@ to the detailed description below for a complete description.  verb(
+@@ -394,6 +394,7 @@ to the detailed description below for a complete description.  verb(
       --contimeout=SECONDS    set daemon connection timeout in seconds
   -I, --ignore-times          don't skip files that match size and time
       --size-only             skip files that match in size
@@ -83,7 +86,7 @@ diff --git a/rsync.yo b/rsync.yo
       --modify-window=NUM     compare mod-times with reduced accuracy
   -T, --temp-dir=DIR          create temporary files in directory DIR
   -y, --fuzzy                 find similar file for basis if no dest file
-@@ -506,6 +507,12 @@ time to just looking for files that have changed in size.  This is useful
+@@ -554,6 +555,12 @@ time to just looking for files that have changed in size.  This is useful
  when starting to use rsync after using another mirroring system which may
  not preserve timestamps exactly.