Fixed failing hunk.

diff --git a/chmod-option.diff b/chmod-option.diff
index eb61b2178234c33d9fe26db267c0163f4a6dc74e..e251866c23e64d6f2b01bc49e0854699d5bd9207 100644 (file)
--- a/chmod-option.diff
+++ b/chmod-option.diff
@@ -202,9 +202,9 @@ command before "make":
 +      }
 +      return 0;
 +}
 +      }
 +      return 0;
 +}

---- orig/flist.c       2005-02-03 02:04:20
+--- orig/flist.c       2005-02-09 02:37:15

 +++ flist.c    2004-09-18 01:51:11
 +++ flist.c    2004-09-18 01:51:11

-@@ -70,6 +70,8 @@ extern int max_delete;
+@@ -69,6 +69,8 @@ extern int max_delete;

  extern int orig_umask;
  extern int list_only;
  
  extern int orig_umask;
  extern int list_only;
  


@@ -213,7 +213,7 @@ command before "make":
  extern struct filter_list_struct filter_list;
  extern struct filter_list_struct server_filter_list;
  
  extern struct filter_list_struct filter_list;
  extern struct filter_list_struct server_filter_list;
  

-@@ -886,7 +888,10 @@ skip_filters:
+@@ -885,7 +887,10 @@ skip_filters:

        file->flags = flags;
        file->modtime = st.st_mtime;
        file->length = st.st_size;
        file->flags = flags;
        file->modtime = st.st_mtime;
        file->length = st.st_size;


@@ -225,9 +225,9 @@ command before "make":
        file->uid = st.st_uid;
        file->gid = st.st_gid;
  
        file->uid = st.st_uid;
        file->gid = st.st_gid;
  

---- orig/options.c     2005-02-01 10:39:22
-+++ options.c  2005-01-24 01:48:30
-@@ -132,6 +132,7 @@ char *log_format = NULL;
+--- orig/options.c     2005-02-11 18:21:45
++++ options.c  2005-02-11 22:48:29
+@@ -131,6 +131,7 @@ char *log_format = NULL;

  char *password_file = NULL;
  char *rsync_path = RSYNC_PATH;
  char *backup_dir = NULL;
  char *password_file = NULL;
  char *rsync_path = RSYNC_PATH;
  char *backup_dir = NULL;


@@ -235,7 +235,7 @@ command before "make":
  char backup_dir_buf[MAXPATHLEN];
  int rsync_port = 0;
  int compare_dest = 0;
  char backup_dir_buf[MAXPATHLEN];
  int rsync_port = 0;
  int compare_dest = 0;

-@@ -147,6 +148,8 @@ int list_only = 0;
+@@ -146,6 +147,8 @@ int list_only = 0;

  #define MAX_BATCH_NAME_LEN 256        /* Must be less than MAXPATHLEN-13 */
  char *batch_name = NULL;
  
  #define MAX_BATCH_NAME_LEN 256        /* Must be less than MAXPATHLEN-13 */
  char *batch_name = NULL;
  


@@ -244,7 +244,7 @@ command before "make":
  static int daemon_opt;   /* sets am_daemon after option error-reporting */
  static int F_option_cnt = 0;
  static int modify_window_set;
  static int daemon_opt;   /* sets am_daemon after option error-reporting */
  static int F_option_cnt = 0;
  static int modify_window_set;

-@@ -271,6 +274,7 @@ void usage(enum logcode F)
+@@ -273,6 +276,7 @@ void usage(enum logcode F)

    rprintf(F," -D, --devices               preserve devices (root only)\n");
    rprintf(F," -t, --times                 preserve times\n");
    rprintf(F," -O, --omit-dir-times        omit directories when preserving times\n");
    rprintf(F," -D, --devices               preserve devices (root only)\n");
    rprintf(F," -t, --times                 preserve times\n");
    rprintf(F," -O, --omit-dir-times        omit directories when preserving times\n");


@@ -252,7 +252,7 @@ command before "make":
    rprintf(F," -S, --sparse                handle sparse files efficiently\n");
    rprintf(F," -n, --dry-run               show what would have been transferred\n");
    rprintf(F," -W, --whole-file            copy files whole\n");
    rprintf(F," -S, --sparse                handle sparse files efficiently\n");
    rprintf(F," -n, --dry-run               show what would have been transferred\n");
    rprintf(F," -W, --whole-file            copy files whole\n");

-@@ -386,6 +390,7 @@ static struct poptOption long_options[] 
+@@ -389,6 +393,7 @@ static struct poptOption long_options[] 

    {"perms",           'p', POPT_ARG_NONE,   &preserve_perms, 0, 0, 0 },
    {"owner",           'o', POPT_ARG_NONE,   &preserve_uid, 0, 0, 0 },
    {"group",           'g', POPT_ARG_NONE,   &preserve_gid, 0, 0, 0 },
    {"perms",           'p', POPT_ARG_NONE,   &preserve_perms, 0, 0, 0 },
    {"owner",           'o', POPT_ARG_NONE,   &preserve_uid, 0, 0, 0 },
    {"group",           'g', POPT_ARG_NONE,   &preserve_gid, 0, 0, 0 },


@@ -260,7 +260,7 @@ command before "make":
    {"devices",         'D', POPT_ARG_NONE,   &preserve_devices, 0, 0, 0 },
    {"times",           't', POPT_ARG_NONE,   &preserve_times, 0, 0, 0 },
    {"omit-dir-times",  'O', POPT_ARG_NONE,   &omit_dir_times, 0, 0, 0 },
    {"devices",         'D', POPT_ARG_NONE,   &preserve_devices, 0, 0, 0 },
    {"times",           't', POPT_ARG_NONE,   &preserve_times, 0, 0, 0 },
    {"omit-dir-times",  'O', POPT_ARG_NONE,   &omit_dir_times, 0, 0, 0 },

-@@ -1004,6 +1009,13 @@ int parse_arguments(int *argc, const cha
+@@ -1044,6 +1049,13 @@ int parse_arguments(int *argc, const cha

                return 0;
        }
  
                return 0;
        }
  


@@ -271,10 +271,10 @@ command before "make":
 +              return 0;
 +      }
 +
 +              return 0;
 +      }
 +

-       if (do_progress && !verbose)
-               verbose = 1;
- 
-@@ -1305,6 +1317,11 @@ void server_options(char **args,int *arg
+       if (do_progress && !verbose) {
+               if (refused_verbose) {
+                       create_refuse_error(refused_verbose);
+@@ -1366,6 +1378,11 @@ void server_options(char **args,int *arg

                }
        }
  
                }
        }
  


@@ -286,7 +286,7 @@ command before "make":
        if (files_from && (!am_sender || remote_filesfrom_file)) {
                if (remote_filesfrom_file) {
                        args[ac++] = "--files-from";
        if (files_from && (!am_sender || remote_filesfrom_file)) {
                if (remote_filesfrom_file) {
                        args[ac++] = "--files-from";

---- orig/rsync.yo      2005-02-01 10:39:23
+--- orig/rsync.yo      2005-02-11 10:53:15

 +++ rsync.yo   2005-01-24 01:48:43
 @@ -322,6 +322,7 @@ to the detailed description below for a 
   -D, --devices               preserve devices (root only)
 +++ rsync.yo   2005-01-24 01:48:43
 @@ -322,6 +322,7 @@ to the detailed description below for a 
   -D, --devices               preserve devices (root only)


@@ -296,7 +296,7 @@ command before "make":
   -S, --sparse                handle sparse files efficiently
   -n, --dry-run               show what would have been transferred
   -W, --whole-file            copy files whole
   -S, --sparse                handle sparse files efficiently
   -n, --dry-run               show what would have been transferred
   -W, --whole-file            copy files whole

-@@ -641,6 +642,14 @@ dit(bf(-O, --omit-dir-times)) This tells
+@@ -642,6 +643,14 @@ dit(bf(-O, --omit-dir-times)) This tells

  it is preserving modification times (see bf(--times)).  If NFS is sharing
  the directories on the receiving side, it is a good idea to use bf(-O).
  
  it is preserving modification times (see bf(--times)).  If NFS is sharing
  the directories on the receiving side, it is a good idea to use bf(-O).
  

diff --git a/date-only.diff b/date-only.diff
index d195396134fdc1af708e645cb88348707ea14dd7..e60c68db71e0689da7ac5b751be53b8eb733748b 100644 (file)
--- a/date-only.diff
+++ b/date-only.diff
@@ -15,7 +15,7 @@ Jeremy Bornstein
 
 [Patched update to have context and apply to latest CVS source.]
 
 
 [Patched update to have context and apply to latest CVS source.]
 

---- orig/generator.c   2005-02-03 02:04:20
+--- orig/generator.c   2005-02-11 20:25:07

 +++ generator.c        2004-11-11 22:15:27
 @@ -43,6 +43,7 @@ extern int inplace;
  extern int make_backups;
 +++ generator.c        2004-11-11 22:15:27
 @@ -43,6 +43,7 @@ extern int inplace;
  extern int make_backups;


@@ -34,9 +34,9 @@ Jeremy Bornstein
        if (st->st_size != file->length)
                return 0;
  
        if (st->st_size != file->length)
                return 0;
  

---- orig/options.c     2005-02-01 10:39:22
+--- orig/options.c     2005-02-11 18:21:45

 +++ options.c  2005-01-28 19:14:15
 +++ options.c  2005-01-28 19:14:15

-@@ -88,6 +88,7 @@ int keep_partial = 0;
+@@ -87,6 +87,7 @@ int keep_partial = 0;

  int safe_symlinks = 0;
  int copy_unsafe_links = 0;
  int size_only = 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;
  size_t bwlimit_writemax = 0;
  int daemon_bwlimit = 0;
  int bwlimit = 0;
  size_t bwlimit_writemax = 0;

-@@ -298,6 +299,7 @@ void usage(enum logcode F)
+@@ -300,6 +301,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");
    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,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");
    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");

-@@ -352,6 +354,7 @@ static struct poptOption long_options[] 
+@@ -354,6 +356,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 },
    {"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 },
    {"existing",         0,  POPT_ARG_NONE,   &only_existing, 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 },

-@@ -1247,6 +1250,9 @@ void server_options(char **args,int *arg
+@@ -1306,6 +1309,9 @@ void server_options(char **args,int *arg

        if (size_only)
                args[ac++] = "--size-only";
  
        if (size_only)
                args[ac++] = "--size-only";
  


@@ -70,8 +70,8 @@ Jeremy Bornstein
        if (modify_window_set) {
                if (asprintf(&arg, "--modify-window=%d", modify_window) < 0)
                        goto oom;
        if (modify_window_set) {
                if (asprintf(&arg, "--modify-window=%d", modify_window) < 0)
                        goto oom;

---- orig/rsync.yo      2005-02-01 10:39:23
-+++ rsync.yo   2005-01-28 19:14:37
+--- orig/rsync.yo      2005-02-11 10:53:15
++++ rsync.yo   2005-02-11 22:49:10

 @@ -349,6 +349,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
 @@ -349,6 +349,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


@@ -90,6 +90,6 @@ Jeremy Bornstein
 +timestamp, regardless of size. This may be useful when the remote
 +files have passed through a size-changing filter, e.g. for encryption.
 +
 +timestamp, regardless of size. This may be useful when the remote
 +files have passed through a size-changing filter, e.g. for encryption.
 +

- dit(bf(--modify-window)) When comparing two timestamps rsync treats
- the timestamps as being equal if they are within the value of
- modify_window. This is normally zero, but you may find it useful to
+ dit(bf(--modify-window)) When comparing two timestamps, rsync treats the
+ timestamps as being equal if they differ by no more than the modify-window
+ value.  This is normally 0 (for an exact match), but you may find it useful