X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/ac23c3343de86c3e85e1f6a604dc5cec76f3c4f2..2ae38ef57caa0762065a10f844607465320b688a:/link-by-hash.diff

diff --git a/link-by-hash.diff b/link-by-hash.diff
index efe3c14..ee6c89c 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,9 +365,9 @@ the file's name.
 +}
 +
 +#endif
---- orig/options.c	2005-01-25 03:26:51
-+++ options.c	2004-11-27 18:19:42
-@@ -132,6 +132,7 @@ char *log_format = NULL;
+--- orig/options.c	2005-02-07 20:41:56
++++ options.c	2005-01-28 19:32:26
+@@ -131,6 +131,7 @@ char *log_format = NULL;
  char *password_file = NULL;
  char *rsync_path = RSYNC_PATH;
  char *backup_dir = NULL;
@@ -375,15 +375,15 @@ the file's name.
  char backup_dir_buf[MAXPATHLEN];
  int rsync_port = 0;
  int compare_dest = 0;
-@@ -297,6 +298,7 @@ void usage(enum logcode F)
+@@ -302,6 +303,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");
 +  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");
-@@ -335,7 +337,7 @@ void usage(enum logcode F)
+   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");
+@@ -340,7 +342,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[] = {
-@@ -401,6 +403,7 @@ static struct poptOption long_options[] 
+@@ -407,6 +409,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.
    /* 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 },
-@@ -788,6 +791,21 @@ int parse_arguments(int *argc, const cha
+@@ -799,6 +802,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 (opt-BASE is its index). */
-@@ -1277,6 +1295,11 @@ void server_options(char **args,int *arg
+@@ -1304,6 +1322,11 @@ void server_options(char **args,int *arg
  		}
  	}
  
@@ -434,9 +434,9 @@ the file's name.
  	if (files_from && (!am_sender || remote_filesfrom_file)) {
  		if (remote_filesfrom_file) {
  			args[ac++] = "--files-from";
---- orig/receiver.c	2005-01-24 01:43:10
+--- orig/receiver.c	2005-02-07 20:41:56
 +++ receiver.c	2005-01-15 21:29:13
-@@ -36,6 +36,7 @@ extern int preserve_hard_links;
+@@ -35,6 +35,7 @@ extern int preserve_hard_links;
  extern int preserve_perms;
  extern int io_error;
  extern char *tmpdir;
@@ -444,7 +444,7 @@ the file's name.
  extern char *partial_dir;
  extern char *basis_dir[];
  extern int basis_dir_cnt;
-@@ -131,12 +132,13 @@ static int get_tmpname(char *fnametmp, c
+@@ -137,12 +138,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;
-@@ -156,6 +158,9 @@ static int receive_data(int f_in, char *
+@@ -162,6 +164,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) {
-@@ -172,6 +177,8 @@ static int receive_data(int f_in, char *
+@@ -178,6 +183,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;
-@@ -198,6 +205,8 @@ static int receive_data(int f_in, char *
+@@ -204,6 +211,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) {
-@@ -238,6 +247,8 @@ static int receive_data(int f_in, char *
+@@ -244,6 +253,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);
-@@ -253,7 +264,7 @@ static int receive_data(int f_in, char *
+@@ -259,7 +270,7 @@ static int receive_data(int f_in, char *
  
  static void discard_receive_data(int f_in, OFF_T length)
  {
@@ -505,11 +505,11 @@ the file's name.
  }
  
  
-@@ -486,8 +497,12 @@ int recv_files(int f_in, struct file_lis
+@@ -501,8 +512,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
@@ -519,9 +519,9 @@ the file's name.
  
  		log_recv(file, &initial_stats);
  
---- orig/rsync.c	2005-01-24 00:57:24
-+++ rsync.c	2004-08-13 18:14:34
-@@ -35,6 +35,7 @@ extern int force_delete;
+--- orig/rsync.c	2005-02-07 20:41:57
++++ rsync.c	2005-02-07 21:11:30
+@@ -36,6 +36,7 @@ extern int force_delete;
  extern int recurse;
  extern int keep_dirlinks;
  extern int make_backups;
@@ -529,12 +529,12 @@ the file's name.
  extern char *backup_dir;
  extern int inplace;
  
-@@ -280,7 +281,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);
+@@ -287,7 +288,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-25 00:53:58
+--- orig/rsync.h	2005-02-07 20:41:57
 +++ rsync.h	2004-07-03 20:20:15
-@@ -545,6 +545,14 @@ struct stats {
+@@ -600,6 +600,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-02-06 07:24:23
++++ rsync.yo	2005-01-28 19:32:45
+@@ -354,6 +354,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
+      --link-dest=DIR         hardlink to files in DIR when unchanged
++     --link-by-hash=DIR      create hardlinks by hash to DIR for regular files
+  -z, --compress              compress file data
+  -C, --cvs-exclude           auto-ignore files in the same way CVS does
+  -f, --filter=RULE           add a file-filtering RULE