X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/2c2d83dc2cd9b148fef39bd279270da819372474..81a5d4ab71cd51f98e160a9e5a402adc591488db:/link-by-hash.diff

diff --git a/link-by-hash.diff b/link-by-hash.diff
index a540755..eb6cf59 100644
--- a/link-by-hash.diff
+++ b/link-by-hash.diff
@@ -49,7 +49,7 @@ the file's name.
 +
 +extern char *link_by_hash_dir;
 +
-+#ifdef HAVE_LINK
++#if HAVE_LINK
 +
 +char* make_hash_name(struct file_struct *file)
 +{
@@ -365,42 +365,42 @@ the file's name.
 +}
 +
 +#endif
---- orig/options.c	2005-01-01 21:11:00
-+++ options.c	2004-11-27 18:19:42
-@@ -128,6 +128,7 @@ char *log_format = NULL;
+--- orig/options.c	2005-03-01 05:49:24
++++ options.c	2005-03-01 01:27:55
+@@ -140,6 +140,7 @@ char *log_format = NULL;
  char *password_file = NULL;
  char *rsync_path = RSYNC_PATH;
  char *backup_dir = NULL;
 +char *link_by_hash_dir = NULL;
  char backup_dir_buf[MAXPATHLEN];
  int rsync_port = 0;
- int copy_dest = 0;
-@@ -288,6 +289,7 @@ void usage(enum logcode F)
+ int compare_dest = 0;
+@@ -318,6 +319,7 @@ void usage(enum logcode F)
+   rprintf(F," -y, --fuzzy                 find similar file for basis if no dest file\n");
    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");
-+  rprintf(F,"     --link-by-hash=DIR      create hardlinks by hash to DIR for regular files\n");
-   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");
-@@ -323,7 +325,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP
-       OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED,
-       OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST,
++  rprintf(F,"     --link-by-hash=DIR      create hardlinks by hash into DIR\n");
+   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");
+@@ -357,7 +359,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_LINK_DEST,
        OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
 -      OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT, OPT_MAX_SIZE,
 +      OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT, OPT_MAX_SIZE, OPT_LINK_BY_HASH,
        OPT_REFUSED_BASE = 9000};
  
  static struct poptOption long_options[] = {
-@@ -384,6 +386,7 @@ static struct poptOption long_options[] 
+@@ -425,6 +427,7 @@ static struct poptOption long_options[] 
+   {"temp-dir",        'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 },
    {"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 },
 +  {"link-by-hash",     0,  POPT_ARG_STRING, 0, OPT_LINK_BY_HASH, 0, 0},
+   {"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 },
-   {"stats",            0,  POPT_ARG_NONE,   &do_stats, 0, 0, 0 },
-@@ -750,6 +753,21 @@ int parse_arguments(int *argc, const cha
+@@ -854,6 +857,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). */
-@@ -1226,6 +1244,11 @@ void server_options(char **args,int *arg
+ 			 * turned this option off. */
+@@ -1435,6 +1453,11 @@ void server_options(char **args,int *arg
  		}
  	}
  
@@ -431,20 +431,20 @@ the file's name.
 +		args[ac++] = link_by_hash_dir;
 +	}
 +
- 	if (files_from && (!am_sender || remote_filesfrom_file)) {
- 		if (remote_filesfrom_file) {
+ 	if (files_from && (!am_sender || filesfrom_host)) {
+ 		if (filesfrom_host) {
  			args[ac++] = "--files-from";
---- orig/receiver.c	2005-01-01 21:11:00
-+++ receiver.c	2005-01-01 21:17:34
-@@ -40,6 +40,7 @@ extern int io_error;
+--- orig/receiver.c	2005-02-26 19:27:54
++++ receiver.c	2005-01-15 21:29:13
+@@ -51,6 +51,7 @@ extern int delay_updates;
+ extern struct stats stats;
+ extern char *log_format;
  extern char *tmpdir;
++extern char *link_by_hash_dir;
  extern char *partial_dir;
  extern char *basis_dir[];
-+extern char *link_by_hash_dir;
- extern int make_backups;
- extern int do_progress;
- extern char *backup_dir;
-@@ -203,12 +204,13 @@ static int get_tmpname(char *fnametmp, c
+ 
+@@ -183,12 +184,13 @@ static int get_tmpname(char *fnametmp, c
  
  
  static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
@@ -459,7 +459,7 @@ the file's name.
  	int32 len;
  	OFF_T offset = 0;
  	OFF_T offset2;
-@@ -228,6 +230,9 @@ static int receive_data(int f_in, char *
+@@ -208,6 +210,9 @@ static int receive_data(int f_in, char *
  	} else
  		mapbuf = NULL;
  
@@ -469,7 +469,7 @@ the file's name.
  	sum_init(checksum_seed);
  
  	while ((i = recv_token(f_in, &data)) != 0) {
-@@ -244,6 +249,8 @@ static int receive_data(int f_in, char *
+@@ -224,6 +229,8 @@ static int receive_data(int f_in, char *
  			cleanup_got_literal = 1;
  
  			sum_update(data, i);
@@ -478,7 +478,7 @@ the file's name.
  
  			if (fd != -1 && write_file(fd,data,i) != i)
  				goto report_write_error;
-@@ -270,6 +277,8 @@ static int receive_data(int f_in, char *
+@@ -250,6 +257,8 @@ static int receive_data(int f_in, char *
  
  			see_token(map, len);
  			sum_update(map, len);
@@ -487,7 +487,7 @@ the file's name.
  		}
  
  		if (inplace) {
-@@ -310,6 +319,8 @@ static int receive_data(int f_in, char *
+@@ -290,6 +299,8 @@ static int receive_data(int f_in, char *
  	}
  
  	sum_end(file_sum1);
@@ -496,7 +496,7 @@ the file's name.
  
  	if (mapbuf)
  		unmap_file(mapbuf);
-@@ -325,7 +336,7 @@ static int receive_data(int f_in, char *
+@@ -335,7 +346,7 @@ static void read_gen_name(int fd, char *
  
  static void discard_receive_data(int f_in, OFF_T length)
  {
@@ -505,11 +505,11 @@ the file's name.
  }
  
  
-@@ -553,8 +564,12 @@ int recv_files(int f_in, struct file_lis
+@@ -602,8 +613,12 @@ int recv_files(int f_in, struct file_lis
  			rprintf(FINFO, "%s\n", safe_fname(fname));
  
  		/* recv file data */
-+#ifdef HAVE_LINK
++#if HAVE_LINK
 +		if (link_by_hash_dir)
 +			file->u.sum = (char*)malloc(MD4_SUM_LENGTH);
 +#endif
@@ -517,24 +517,24 @@ the file's name.
 -				       fname, fd2, file->length);
 +				       fname, fd2, file->length, file->u.sum);
  
- 		log_recv(file, &initial_stats);
- 
---- orig/rsync.c	2004-09-07 21:45:30
-+++ rsync.c	2004-08-13 18:14:34
-@@ -34,6 +34,7 @@ extern int force_delete;
- extern int recurse;
+ 		if (!log_before_transfer)
+ 			log_recv(file, &initial_stats, iflags);
+--- orig/rsync.c	2005-02-25 18:44:31
++++ rsync.c	2005-02-21 11:04:36
+@@ -39,6 +39,7 @@ extern int recurse;
  extern int keep_dirlinks;
  extern int make_backups;
+ extern struct stats stats;
 +extern char *link_by_hash_dir;
- extern char *backup_dir;
- extern int inplace;
  
-@@ -254,7 +255,12 @@ void finish_transfer(char *fname, char *
- 	/* move tmp file over real file */
- 	if (verbose > 2)
- 		rprintf(FINFO, "renaming %s to %s\n", fnametmp, fname);
+ 
+ /*
+@@ -189,7 +190,12 @@ void finish_transfer(char *fname, char *
+ 		rprintf(FINFO, "renaming %s to %s\n",
+ 			safe_fname(fnametmp), safe_fname(fname));
+ 	}
 -	ret = robust_rename(fnametmp, fname, file->mode & INITACCESSPERMS);
-+#ifdef HAVE_LINK
++#if HAVE_LINK
 +	if (link_by_hash_dir)
 +		ret = link_by_hash(fnametmp, fname, file);
 +	else
@@ -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-01-01 21:11:01
+--- orig/rsync.h	2005-02-23 02:57:27
 +++ rsync.h	2004-07-03 20:20:15
-@@ -536,6 +536,14 @@ struct stats {
+@@ -621,6 +621,14 @@ struct stats {
  	int current_file_index;
  };
  
@@ -558,5 +558,15 @@ the file's name.
 +};
 +
  
- /* we need this function because of the silly way in which duplicate
-    entries are handled in the file lists - we can't change this
+ #include "byteorder.h"
+ #include "lib/mdfour.h"
+--- orig/rsync.yo	2005-03-01 01:22:59
++++ rsync.yo	2005-02-13 06:58:47
+@@ -355,6 +355,7 @@ to the detailed description below for a 
+  -y, --fuzzy                 find similar file for basis if no dest file
+      --compare-dest=DIR      also compare received files relative to DIR
+      --link-dest=DIR         hardlink to files in DIR when unchanged
++     --link-by-hash=DIR      create hardlinks by hash into DIR
+  -z, --compress              compress file data during the transfer
+  -C, --cvs-exclude           auto-ignore files in the same way CVS does
+  -f, --filter=RULE           add a file-filtering RULE