Fixed a failing hunk.

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

diff --git a/date-only.diff b/date-only.diff
index 0e978d9..a984837 100644 (file)
--- a/date-only.diff
+++ b/date-only.diff
@@ -15,44 +15,44 @@ Jeremy Bornstein
 
 [Patched update to have context and apply to latest CVS source.]
 
---- orig/generator.c   2004-07-16 19:35:29
-+++ generator.c        2004-07-03 20:16:51
-@@ -39,6 +39,7 @@ extern int opt_ignore_existing;
+--- orig/generator.c   2004-11-27 17:53:24
++++ generator.c        2004-11-11 22:15:27
+@@ -40,6 +40,7 @@ extern int inplace;
+ extern int make_backups;
  extern int csum_length;
  extern int ignore_times;
- extern int size_only;
 +extern int date_only;
+ extern int size_only;
+ extern OFF_T max_size;
  extern int io_timeout;
- extern int protocol_version;
- extern int always_checksum;
-@@ -60,6 +61,8 @@ extern struct exclude_list_struct server
- /* choose whether to skip a particular file */
- static int skip_file(char *fname, struct file_struct *file, STRUCT_STAT *st)
+@@ -78,6 +79,8 @@ static int unchanged_attrs(struct file_s
+ /* 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)
  {
 +      if (date_only)
 +              return cmp_modtime(st->st_mtime, file->modtime) == 0;
        if (st->st_size != file->length)
                return 0;
-       if (link_dest) {
---- orig/options.c     2004-07-16 20:07:22
-+++ options.c  2004-07-03 20:16:51
+ 
+--- orig/options.c     2004-11-27 18:27:35
++++ options.c  2004-11-17 19:41:59
 @@ -84,6 +84,7 @@ int keep_partial = 0;
  int safe_symlinks = 0;
  int copy_unsafe_links = 0;
  int size_only = 0;
 +int date_only = 0;
+ int daemon_bwlimit = 0;
  int bwlimit = 0;
  size_t bwlimit_writemax = 0;
- int delete_after = 0;
-@@ -272,6 +273,7 @@ void usage(enum logcode F)
+@@ -283,6 +284,7 @@ void usage(enum logcode F)
    rprintf(F,"     --timeout=TIME          set I/O timeout in seconds\n");
    rprintf(F," -I, --ignore-times          turn off mod time & file size quick check\n");
    rprintf(F,"     --size-only             ignore mod time for quick check (use size)\n");
 +  rprintf(F,"     --date-only             ignore size for quick check (use 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," -T, --temp-dir=DIR          create temporary files in directory DIR\n");
    rprintf(F,"     --compare-dest=DIR      also compare destination files relative to DIR\n");
-@@ -327,6 +329,7 @@ static struct poptOption long_options[] 
+@@ -333,6 +335,7 @@ static struct poptOption long_options[] 
    {"password-file",    0,  POPT_ARG_STRING, &password_file, 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 },
@@ -60,7 +60,7 @@ Jeremy Bornstein
    {"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 },
    {"delete",           0,  POPT_ARG_NONE,   &delete_mode, 0, 0, 0 },
-@@ -951,6 +954,9 @@ void server_options(char **args,int *arg
+@@ -1169,6 +1172,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      2004-07-16 20:07:23
+--- orig/rsync.yo      2004-11-27 17:53:24
 +++ rsync.yo   2004-07-03 20:16:51
-@@ -322,6 +322,7 @@ verb(
+@@ -353,6 +353,7 @@ verb(
       --timeout=TIME          set I/O timeout in seconds
   -I, --ignore-times          turn off mod time & file size quick check
       --size-only             ignore mod time for quick check (use 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
       --compare-dest=DIR      also compare received files relative to DIR
-@@ -396,6 +397,12 @@ regardless of timestamp. This is useful 
+@@ -435,6 +436,12 @@ regardless of timestamp. This is useful 
  after using another mirroring system which may not preserve timestamps
  exactly.