Fixed hunk fuzz.

[rsync/rsync-patches.git] / link-by-hash.diff

diff --git a/link-by-hash.diff b/link-by-hash.diff
index ee6c89c..94cae34 100644 (file)
--- a/link-by-hash.diff
+++ b/link-by-hash.diff
@@ -365,7 +365,7 @@ the file's name.
 +}
 +
 +#endif
---- orig/options.c     2005-02-07 20:41:56
+--- orig/options.c     2005-02-11 18:21:45
 +++ options.c  2005-01-28 19:32:26
 @@ -131,6 +131,7 @@ char *log_format = NULL;
  char *password_file = NULL;
@@ -375,7 +375,7 @@ the file's name.
  char backup_dir_buf[MAXPATHLEN];
  int rsync_port = 0;
  int compare_dest = 0;
-@@ -302,6 +303,7 @@ void usage(enum logcode F)
+@@ -305,6 +306,7 @@ void usage(enum logcode F)
    rprintf(F,"     --compare-dest=DIR      also compare destination files relative to DIR\n");
    rprintf(F,"     --copy-dest=DIR         ... and include copies of unchanged files\n");
    rprintf(F,"     --link-dest=DIR         hardlink to files in DIR when unchanged\n");
@@ -383,7 +383,7 @@ the file's name.
    rprintf(F," -z, --compress              compress file data\n");
    rprintf(F," -C, --cvs-exclude           auto-ignore files the same way CVS does\n");
    rprintf(F," -f, --filter=RULE           add a file-filtering RULE\n");
-@@ -340,7 +342,7 @@ void usage(enum logcode F)
+@@ -343,7 +345,7 @@ void usage(enum logcode F)
  enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
        OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST,
        OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
@@ -392,7 +392,7 @@ the file's name.
        OPT_REFUSED_BASE = 9000};
  
  static struct poptOption long_options[] = {
-@@ -407,6 +409,7 @@ static struct poptOption long_options[] 
+@@ -411,6 +413,7 @@ static struct poptOption long_options[] 
    {"compare-dest",     0,  POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
    {"copy-dest",        0,  POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
    {"link-dest",        0,  POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 },
@@ -400,7 +400,7 @@ the file's name.
    /* TODO: Should this take an optional int giving the compression level? */
    {"compress",        'z', POPT_ARG_NONE,   &do_compression, 0, 0, 0 },
    {"stats",            0,  POPT_ARG_NONE,   &do_stats, 0, 0, 0 },
-@@ -799,6 +802,21 @@ int parse_arguments(int *argc, const cha
+@@ -831,6 +834,21 @@ int parse_arguments(int *argc, const cha
                        basis_dir[basis_dir_cnt++] = (char *)arg;
                        break;
  
@@ -421,8 +421,8 @@ the file's name.
 +
                default:
                        /* A large opt value means that set_refuse_options()
-                        * turned this option off (opt-BASE is its index). */
-@@ -1304,6 +1322,11 @@ void server_options(char **args,int *arg
+                        * turned this option off. */
+@@ -1366,6 +1384,11 @@ void server_options(char **args,int *arg
                }
        }
  
@@ -434,7 +434,7 @@ the file's name.
        if (files_from && (!am_sender || remote_filesfrom_file)) {
                if (remote_filesfrom_file) {
                        args[ac++] = "--files-from";
---- orig/receiver.c    2005-02-07 20:41:56
+--- orig/receiver.c    2005-02-11 10:53:14
 +++ receiver.c 2005-01-15 21:29:13
 @@ -35,6 +35,7 @@ extern int preserve_hard_links;
  extern int preserve_perms;
@@ -560,7 +560,7 @@ the file's name.
  
  #include "byteorder.h"
  #include "lib/mdfour.h"
---- orig/rsync.yo      2005-02-06 07:24:23
+--- orig/rsync.yo      2005-02-11 23:14:49
 +++ rsync.yo   2005-01-28 19:32:45
 @@ -354,6 +354,7 @@ to the detailed description below for a 
       --compare-dest=DIR      also compare received files relative to DIR