Fixed failing hunks.

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

diff --git a/link-by-hash.diff b/link-by-hash.diff
index ba2df4abda1ae314eadad81266f609d20d56b6e0..5589bd537b8014f3a652530ace3b99d8e54af6d4 100644 (file)
--- a/link-by-hash.diff
+++ b/link-by-hash.diff
@@ -365,9 +365,9 @@ the file's name.
 +}
 +
 +#endif
---- orig/options.c     2005-02-20 01:12:42
+--- orig/options.c     2005-02-21 10:51:52
 +++ options.c  2005-02-14 02:52:09
-@@ -134,6 +134,7 @@ char *log_format = NULL;
+@@ -139,6 +139,7 @@ char *log_format = NULL;
  char *password_file = NULL;
  char *rsync_path = RSYNC_PATH;
  char *backup_dir = NULL;
@@ -375,7 +375,7 @@ the file's name.
  char backup_dir_buf[MAXPATHLEN];
  int rsync_port = 0;
  int compare_dest = 0;
-@@ -314,6 +315,7 @@ void usage(enum logcode F)
+@@ -319,6 +320,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");
-@@ -353,7 +355,7 @@ void usage(enum logcode F)
+@@ -358,7 +360,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[] = {
-@@ -422,6 +424,7 @@ static struct poptOption long_options[] 
+@@ -427,6 +429,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 },
-@@ -853,6 +856,21 @@ int parse_arguments(int *argc, const cha
+@@ -860,6 +863,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. */
-@@ -1431,6 +1449,11 @@ void server_options(char **args,int *arg
+@@ -1440,6 +1458,11 @@ void server_options(char **args,int *arg
                }
        }
  
@@ -519,17 +519,17 @@ the file's name.
  
                if (!log_before_transfer)
                        log_recv(file, &initial_stats, iflags);
---- orig/rsync.c       2005-02-20 00:02:23
-+++ rsync.c    2005-02-19 09:32:31
-@@ -41,6 +41,7 @@ extern int keep_dirlinks;
+--- orig/rsync.c       2005-02-21 10:51:52
++++ rsync.c    2005-02-21 11:04:36
+@@ -38,6 +38,7 @@ extern int recurse;
+ extern int keep_dirlinks;
  extern int make_backups;
  extern struct stats stats;
- extern char *backup_dir;
 +extern char *link_by_hash_dir;
- extern char *log_format;
- extern char *backup_suffix;
- extern int backup_suffix_len;
-@@ -306,7 +307,12 @@ void finish_transfer(char *fname, char *
+ 
+ 
+ /*
+@@ -188,7 +189,12 @@ void finish_transfer(char *fname, char *
                rprintf(FINFO, "renaming %s to %s\n",
                        safe_fname(fnametmp), safe_fname(fname));
        }