Changed the style of the diff headers (use "patch -p1" now).

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

diff --git a/link-by-hash.diff b/link-by-hash.diff
index 612cbf8..abd0bc5 100644 (file)
--- a/link-by-hash.diff
+++ b/link-by-hash.diff
@@ -1,7 +1,8 @@
-After applying this patch and running configure, you MUST run this
-command before "make":
+After applying this patch, run these commands for a successful build:
 
-    make proto
+    ./prepare-source
+    ./configure                      (optional if already run)
+    make
 
 Jason M. Felice writes:
 
@@ -11,8 +12,8 @@ will only store one copy of the unique contents of each file, regardless of
 the file's name.
 
 
---- orig/Makefile.in   2006-01-14 08:14:29
-+++ Makefile.in        2005-11-07 04:37:17
+--- old/Makefile.in
++++ new/Makefile.in
 @@ -34,7 +34,7 @@ OBJS1=rsync.o generator.o receiver.o cle
        main.o checksum.o match.o syscall.o log.o backup.o
  OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o \
@@ -22,8 +23,8 @@ the file's name.
  DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o
  popt_OBJS=popt/findme.o  popt/popt.o  popt/poptconfig.o \
        popt/popthelp.o popt/poptparse.o
---- orig/hashlink.c    2004-09-24 16:44:25
-+++ hashlink.c 2004-09-24 16:44:25
+--- old/hashlink.c
++++ new/hashlink.c
 @@ -0,0 +1,340 @@
 +/*
 +   Copyright (C) Cronosys, LLC 2004
@@ -365,8 +366,8 @@ the file's name.
 +}
 +
 +#endif
---- orig/options.c     2006-01-31 03:11:30
-+++ options.c  2006-01-26 10:57:21
+--- old/options.c
++++ new/options.c
 @@ -144,6 +144,7 @@ char *backup_suffix = NULL;
  char *tmpdir = NULL;
  char *partial_dir = NULL;
@@ -434,8 +435,8 @@ the file's name.
        if (files_from && (!am_sender || filesfrom_host)) {
                if (filesfrom_host) {
                        args[ac++] = "--files-from";
---- orig/receiver.c    2006-01-31 02:30:18
-+++ receiver.c 2005-01-15 21:29:13
+--- old/receiver.c
++++ new/receiver.c
 @@ -54,6 +54,7 @@ extern int delay_updates;
  extern struct stats stats;
  extern char *log_format;
@@ -519,17 +520,17 @@ the file's name.
  
                if (!log_before_transfer)
                        log_item(file, &initial_stats, iflags, NULL);
---- orig/rsync.c       2006-01-31 02:30:18
-+++ rsync.c    2006-01-30 07:19:44
-@@ -40,6 +40,7 @@ extern int inplace;
+--- old/rsync.c
++++ new/rsync.c
+@@ -49,6 +49,7 @@ extern int inplace;
  extern int keep_dirlinks;
  extern int make_backups;
  extern struct stats stats;
 +extern char *link_by_hash_dir;
  
- 
- /*
-@@ -213,8 +214,15 @@ void finish_transfer(char *fname, char *
+ #if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
+ iconv_t ic_chck = (iconv_t)-1;
+@@ -257,8 +258,15 @@ void finish_transfer(char *fname, char *
        /* move tmp file over real file */
        if (verbose > 2)
                rprintf(FINFO, "renaming %s to %s\n", fnametmp, fname);
@@ -547,8 +548,8 @@ the file's name.
        if (ret < 0) {
                rsyserr(FERROR, errno, "%s %s -> \"%s\"",
                        ret == -2 ? "copy" : "rename",
---- orig/rsync.h       2006-01-30 20:39:09
-+++ rsync.h    2006-01-30 20:42:44
+--- old/rsync.h
++++ new/rsync.h
 @@ -640,6 +640,14 @@ struct stats {
        int current_file_index;
  };
@@ -564,8 +565,8 @@ the file's name.
  struct chmod_mode_struct;
  
  #include "byteorder.h"
---- orig/rsync.yo      2006-01-31 03:05:44
-+++ rsync.yo   2005-02-13 06:58:47
+--- old/rsync.yo
++++ new/rsync.yo
 @@ -361,6 +361,7 @@ to the detailed description below for a 
       --compare-dest=DIR      also compare received files relative to DIR
       --copy-dest=DIR         ... and include copies of unchanged files