Fixed a failing hunk.

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

diff --git a/link-by-hash.diff b/link-by-hash.diff
index 49bcf6b..c8dbc04 100644 (file)
--- a/link-by-hash.diff
+++ b/link-by-hash.diff
@@ -11,7 +11,7 @@ will only store one copy of the unique contents of each file, regardless of
 the file's name.
 
 
---- orig/Makefile.in   2004-08-13 07:18:58
+--- orig/Makefile.in   2004-10-14 17:11:40
 +++ Makefile.in        2004-07-03 20:20:15
 @@ -35,7 +35,7 @@ OBJS1=rsync.o generator.o receiver.o cle
        main.o checksum.o match.o syscall.o log.o backup.o
@@ -365,8 +365,8 @@ the file's name.
 +}
 +
 +#endif
---- orig/options.c     2004-09-23 17:42:07
-+++ options.c  2004-08-13 18:13:18
+--- orig/options.c     2004-10-14 17:11:40
++++ options.c  2004-10-14 17:24:21
 @@ -126,6 +126,7 @@ char *log_format = NULL;
  char *password_file = NULL;
  char *rsync_path = RSYNC_PATH;
@@ -383,8 +383,8 @@ the file's name.
    rprintf(F," -P                          equivalent to --partial --progress\n");
    rprintf(F," -z, --compress              compress file data\n");
    rprintf(F," -C, --cvs-exclude           auto ignore files in the same way CVS does\n");
-@@ -319,7 +321,7 @@ void usage(enum logcode F)
- enum {OPT_VERSION = 1000, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
+@@ -312,7 +314,7 @@ void usage(enum logcode F)
+ enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
        OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED, OPT_LINK_DEST,
        OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
 -      OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT,
@@ -392,15 +392,15 @@ the file's name.
        OPT_REFUSED_BASE = 9000};
  
  static struct poptOption long_options[] = {
-@@ -378,6 +380,7 @@ static struct poptOption long_options[] 
+@@ -371,6 +373,7 @@ static struct poptOption long_options[] 
    {"temp-dir",        'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 },
    {"compare-dest",     0,  POPT_ARG_STRING, &compare_dest, 0, 0, 0 },
-   {"link-dest",        0,  POPT_ARG_STRING, &compare_dest,  OPT_LINK_DEST, 0, 0 },
-+  {"link-by-hash",     0,  POPT_ARG_STRING, 0,              OPT_LINK_BY_HASH, 0, 0},
+   {"link-dest",        0,  POPT_ARG_STRING, &compare_dest, OPT_LINK_DEST, 0, 0 },
++  {"link-by-hash",     0,  POPT_ARG_STRING, 0, OPT_LINK_BY_HASH, 0, 0},
    /* TODO: Should this take an optional int giving the compression level? */
    {"compress",        'z', POPT_ARG_NONE,   &do_compression, 0, 0, 0 },
-   {"daemon",           0,  POPT_ARG_NONE,   &daemon_opt, 0, 0, 0 },
-@@ -616,6 +619,21 @@ int parse_arguments(int *argc, const cha
+   {"stats",            0,  POPT_ARG_NONE,   &do_stats, 0, 0, 0 },
+@@ -683,6 +686,21 @@ int parse_arguments(int *argc, const cha
                        return 0;
  #endif
  
@@ -422,7 +422,7 @@ the file's name.
                default:
                        /* A large opt value means that set_refuse_options()
                         * turned this option off (opt-BASE is its index). */
-@@ -1087,6 +1105,11 @@ void server_options(char **args,int *arg
+@@ -1144,6 +1162,11 @@ void server_options(char **args,int *arg
                args[ac++] = compare_dest;
        }
  
@@ -543,9 +543,9 @@ the file's name.
        if (ret < 0) {
                rsyserr(FERROR, errno, "%s %s -> \"%s\"",
                    ret == -2 ? "copy" : "rename",
---- orig/rsync.h       2004-09-22 08:47:31
+--- orig/rsync.h       2004-10-09 03:21:56
 +++ rsync.h    2004-07-03 20:20:15
-@@ -526,6 +526,14 @@ struct stats {
+@@ -529,6 +529,14 @@ struct stats {
        int current_file_index;
  };