Fixed failing hunks.

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

diff --git a/link-by-hash.diff b/link-by-hash.diff
index ccc0a0e..1f27c61 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-16 15:35:53
+--- orig/options.c     2005-02-19 09:27:48
 +++ options.c  2005-02-14 02:52:09
 @@ -132,6 +132,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;
-@@ -309,6 +310,7 @@ void usage(enum logcode F)
+@@ -310,6 +311,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 during the transfer\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");
-@@ -348,7 +350,7 @@ void usage(enum logcode F)
+@@ -349,7 +351,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[] = {
-@@ -416,6 +418,7 @@ static struct poptOption long_options[] 
+@@ -417,6 +419,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.
    {"fuzzy",           'y', POPT_ARG_NONE,   &fuzzy_basis, 0, 0, 0 },
    /* TODO: Should this take an optional int giving the compression level? */
    {"compress",        'z', POPT_ARG_NONE,   &do_compression, 0, 0, 0 },
-@@ -840,6 +843,21 @@ int parse_arguments(int *argc, const cha
+@@ -838,6 +841,21 @@ int parse_arguments(int *argc, const cha
                        basis_dir[basis_dir_cnt++] = (char *)arg;
                        break;
  
@@ -422,7 +422,7 @@ the file's name.
                default:
                        /* A large opt value means that set_refuse_options()
                         * turned this option off. */
-@@ -1392,6 +1410,11 @@ void server_options(char **args,int *arg
+@@ -1405,6 +1423,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-16 15:35:53
+--- orig/receiver.c    2005-02-19 09:27:48
 +++ receiver.c 2005-01-15 21:29:13
 @@ -37,6 +37,7 @@ extern int preserve_hard_links;
  extern int preserve_perms;
@@ -505,7 +505,7 @@ the file's name.
  }
  
  
-@@ -555,8 +566,12 @@ int recv_files(int f_in, struct file_lis
+@@ -558,8 +569,12 @@ int recv_files(int f_in, struct file_lis
                        rprintf(FINFO, "%s\n", safe_fname(fname));
  
                /* recv file data */
@@ -519,17 +519,17 @@ the file's name.
  
                if (!log_before_transfer)
                        log_recv(file, &initial_stats, iflags);
---- orig/rsync.c       2005-02-14 02:45:10
-+++ rsync.c    2005-02-07 21:11:30
-@@ -36,6 +36,7 @@ extern int force_delete;
- extern int recurse;
- extern int keep_dirlinks;
+--- orig/rsync.c       2005-02-19 09:27:48
++++ rsync.c    2005-02-19 09:32:31
+@@ -40,6 +40,7 @@ extern int keep_dirlinks;
  extern int make_backups;
-+extern char *link_by_hash_dir;
+ extern struct stats stats;
  extern char *backup_dir;
- extern int inplace;
++extern char *link_by_hash_dir;
+ extern char *log_format;
+ 
  
-@@ -287,7 +288,12 @@ void finish_transfer(char *fname, char *
+@@ -279,7 +280,12 @@ void finish_transfer(char *fname, char *
                rprintf(FINFO, "renaming %s to %s\n",
                        safe_fname(fnametmp), safe_fname(fname));
        }
@@ -543,9 +543,9 @@ the file's name.
        if (ret < 0) {
                rsyserr(FERROR, errno, "%s %s -> \"%s\"",
                    ret == -2 ? "copy" : "rename",
---- orig/rsync.h       2005-02-16 15:35:54
+--- orig/rsync.h       2005-02-19 09:27:49
 +++ rsync.h    2004-07-03 20:20:15
-@@ -618,6 +618,14 @@ struct stats {
+@@ -619,6 +619,14 @@ struct stats {
        int current_file_index;
  };
  
@@ -560,7 +560,7 @@ the file's name.
  
  #include "byteorder.h"
  #include "lib/mdfour.h"
---- orig/rsync.yo      2005-02-16 15:35:54
+--- orig/rsync.yo      2005-02-19 09:27:49
 +++ rsync.yo   2005-02-13 06:58:47
 @@ -355,6 +355,7 @@ to the detailed description below for a 
       --compare-dest=DIR      also compare received files relative to DIR