Fixed failing hunks.

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

diff --git a/date-only.diff b/date-only.diff
index e86b29231dfe632b490ea93ed111d60e2eeab78f..b9f87bb4c66bd2be8899749a3f611e5941620af3 100644 (file)
--- a/date-only.diff
+++ b/date-only.diff
@@ -15,28 +15,28 @@ Jeremy Bornstein
 
 [Patched update to have context and apply to latest CVS source.]
 
---- orig/generator.c   2005-03-29 01:05:12
+--- orig/generator.c   2006-01-20 21:12:17
 +++ generator.c        2004-11-11 22:15:27
-@@ -55,6 +55,7 @@ extern int inplace;
+@@ -59,6 +59,7 @@ extern int append_mode;
  extern int make_backups;
  extern int csum_length;
  extern int ignore_times;
 +extern int date_only;
  extern int size_only;
  extern OFF_T max_size;
- extern int io_timeout;
-@@ -354,6 +355,8 @@ void itemize(struct file_struct *file, i
+ extern OFF_T min_size;
+@@ -378,6 +379,8 @@ void itemize(struct file_struct *file, i
  /* Perform our quick-check heuristic for determining if a file is unchanged. */
- static int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
+ int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
  {
 +      if (date_only)
 +              return cmp_modtime(st->st_mtime, file->modtime) == 0;
        if (st->st_size != file->length)
                return 0;
  
---- orig/options.c     2005-03-28 20:56:55
-+++ options.c  2005-01-28 19:14:15
-@@ -89,6 +89,7 @@ int keep_partial = 0;
+--- orig/options.c     2006-01-21 07:55:00
++++ options.c  2006-01-21 08:07:05
+@@ -93,6 +93,7 @@ int keep_partial = 0;
  int safe_symlinks = 0;
  int copy_unsafe_links = 0;
  int size_only = 0;
@@ -44,7 +44,7 @@ Jeremy Bornstein
  int daemon_bwlimit = 0;
  int bwlimit = 0;
  int fuzzy_basis = 0;
-@@ -314,6 +315,7 @@ void usage(enum logcode F)
+@@ -321,6 +322,7 @@ void usage(enum logcode F)
    rprintf(F,"     --timeout=TIME          set I/O timeout in seconds\n");
    rprintf(F," -I, --ignore-times          don't skip files that match in size and mod-time\n");
    rprintf(F,"     --size-only             skip files that match in size\n");
@@ -52,15 +52,15 @@ Jeremy Bornstein
    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");
-@@ -371,6 +373,7 @@ static struct poptOption long_options[] 
-   {"password-file",    0,  POPT_ARG_STRING, &password_file, 0, 0, 0 },
+@@ -425,6 +427,7 @@ static struct poptOption long_options[] 
+   {"chmod",            0,  POPT_ARG_STRING, &chmod_mode, 0, 0, 0 },
    {"ignore-times",    'I', POPT_ARG_NONE,   &ignore_times, 0, 0, 0 },
    {"size-only",        0,  POPT_ARG_NONE,   &size_only, 0, 0, 0 },
 +  {"date-only",        0,  POPT_ARG_NONE,   &date_only, 0, 0, 0 },
-   {"modify-window",    0,  POPT_ARG_INT,    &modify_window, OPT_MODIFY_WINDOW, 0, 0 },
-   {"one-file-system", 'x', POPT_ARG_NONE,   &one_file_system, 0, 0, 0 },
-   {"existing",         0,  POPT_ARG_NONE,   &only_existing, 0, 0, 0 },
-@@ -1379,6 +1382,9 @@ void server_options(char **args,int *arg
+   {"one-file-system", 'x', POPT_ARG_NONE,   0, 'x', 0, 0 },
+   {"update",          'u', POPT_ARG_NONE,   &update_only, 0, 0, 0 },
+   {"existing",         0,  POPT_ARG_NONE,   &ignore_non_existing, 0, 0, 0 },
+@@ -1573,6 +1576,9 @@ void server_options(char **args,int *arg
        if (size_only)
                args[ac++] = "--size-only";
  
@@ -70,9 +70,9 @@ Jeremy Bornstein
        if (modify_window_set) {
                if (asprintf(&arg, "--modify-window=%d", modify_window) < 0)
                        goto oom;
---- orig/rsync.yo      2005-03-28 20:56:55
+--- orig/rsync.yo      2006-01-21 08:12:23
 +++ rsync.yo   2005-02-11 22:49:10
-@@ -349,6 +349,7 @@ to the detailed description below for a 
+@@ -350,6 +350,7 @@ to the detailed description below for a 
       --timeout=TIME          set I/O timeout in seconds
   -I, --ignore-times          don't skip files that match size and time
       --size-only             skip files that match in size
@@ -80,7 +80,7 @@ Jeremy Bornstein
       --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
-@@ -446,6 +447,12 @@ regardless of timestamp. This is useful 
+@@ -453,6 +454,12 @@ regardless of timestamp. This is useful 
  after using another mirroring system which may not preserve timestamps
  exactly.