Fixed a failing hunk.

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

diff --git a/date-only.diff b/date-only.diff
index 85da954..805934c 100644 (file)
--- a/date-only.diff
+++ b/date-only.diff
@@ -15,17 +15,17 @@ Jeremy Bornstein
 
 [Patched update to have context and apply to latest CVS source.]
 
---- orig/generator.c   2004-09-20 19:50:13
-+++ generator.c        2004-07-03 20:16:51
-@@ -41,6 +41,7 @@ extern int make_backups;
+--- orig/generator.c   2004-11-11 22:13:09
++++ 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;
-@@ -62,6 +63,8 @@ extern struct exclude_list_struct server
+@@ -63,6 +64,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)
  {
@@ -34,7 +34,7 @@ Jeremy Bornstein
        if (st->st_size != file->length)
                return 0;
        if (link_dest) {
---- orig/options.c     2004-09-23 17:42:07
+--- orig/options.c     2004-11-11 22:13:09
 +++ options.c  2004-07-03 20:16:51
 @@ -84,6 +84,7 @@ int keep_partial = 0;
  int safe_symlinks = 0;
@@ -44,7 +44,7 @@ Jeremy Bornstein
  int bwlimit = 0;
  size_t bwlimit_writemax = 0;
  int delete_after = 0;
-@@ -275,6 +276,7 @@ void usage(enum logcode F)
+@@ -278,6 +279,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");
@@ -52,7 +52,7 @@ 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,"     --compare-dest=DIR      also compare destination files relative to DIR\n");
-@@ -330,6 +332,7 @@ static struct poptOption long_options[] 
+@@ -326,6 +328,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 },
-@@ -1034,6 +1037,9 @@ void server_options(char **args,int *arg
+@@ -1129,6 +1132,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-09-24 16:42:30
+--- orig/rsync.yo      2004-11-11 22:13:11
 +++ rsync.yo   2004-07-03 20:16:51
-@@ -352,6 +352,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
-@@ -426,6 +427,12 @@ regardless of timestamp. This is useful 
+@@ -427,6 +428,12 @@ regardless of timestamp. This is useful 
  after using another mirroring system which may not preserve timestamps
  exactly.