X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/70c5d1497b909ff59100d1036df3d5d69363414b..9978080ec09f62c426e6a1b81598a2f33bd91cd1:/link-by-hash.diff

diff --git a/link-by-hash.diff b/link-by-hash.diff
index 69fef58..612cbf8 100644
--- a/link-by-hash.diff
+++ b/link-by-hash.diff
@@ -11,12 +11,12 @@ will only store one copy of the unique contents of each file, regardless of
 the file's name.
 
 
---- orig/Makefile.in	2005-07-07 23:11:07
-+++ Makefile.in	2004-07-03 20:20:15
+--- orig/Makefile.in	2006-01-14 08:14:29
++++ Makefile.in	2005-11-07 04:37:17
 @@ -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 \
- 	fileio.o batch.o clientname.o
+ 	fileio.o batch.o clientname.o chmod.o
 -OBJS3=progress.o pipe.o
 +OBJS3=progress.o pipe.o hashlink.o
  DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o
@@ -365,44 +365,44 @@ the file's name.
 +}
 +
 +#endif
---- orig/options.c	2005-10-14 20:03:21
-+++ options.c	2005-10-14 20:18:23
-@@ -142,6 +142,7 @@ char *log_format = NULL;
- char *password_file = NULL;
- char *rsync_path = RSYNC_PATH;
- char *backup_dir = NULL;
+--- orig/options.c	2006-01-31 03:11:30
++++ options.c	2006-01-26 10:57:21
+@@ -144,6 +144,7 @@ char *backup_suffix = NULL;
+ char *tmpdir = NULL;
+ char *partial_dir = NULL;
+ char *basis_dir[MAX_BASIS_DIRS+1];
 +char *link_by_hash_dir = NULL;
- char backup_dir_buf[MAXPATHLEN];
- int rsync_port = 0;
- int compare_dest = 0;
-@@ -323,6 +324,7 @@ void usage(enum logcode F)
+ char *config_file = NULL;
+ char *shell_cmd = NULL;
+ char *log_format = NULL;
+@@ -337,6 +338,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 into DIR\n");
    rprintf(F," -z, --compress              compress file data during the transfer\n");
+   rprintf(F,"     --compress-level=NUM    explicitly set compression level\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");
-@@ -365,7 +367,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP
-       OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST,
-       OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, OPT_MIN_SIZE,
+@@ -383,7 +385,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP
+       OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST, OPT_HELP,
+       OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, OPT_MIN_SIZE, OPT_CHMOD,
        OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH, OPT_MAX_SIZE,
--      OPT_REFUSED_BASE = 9000};
-+      OPT_LINK_BY_HASH, OPT_REFUSED_BASE = 9000};
+-      OPT_NO_D,
++      OPT_NO_D, OPT_LINK_BY_HASH,
+       OPT_SERVER, OPT_REFUSED_BASE = 9000};
  
  static struct poptOption long_options[] = {
-   /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
-@@ -450,6 +452,7 @@ static struct poptOption long_options[] 
+@@ -478,6 +480,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 },
 +  {"link-by-hash",     0,  POPT_ARG_STRING, 0, OPT_LINK_BY_HASH, 0, 0},
    {"fuzzy",           'y', POPT_ARG_NONE,   &fuzzy_basis, 0, 0, 0 },
-   {"compress",        'z', POPT_ARG_NONE,   &do_compression, 0, 0, 0 },
-   {0,                 'P', POPT_ARG_NONE,   0, 'P', 0, 0 },
-@@ -968,6 +971,21 @@ int parse_arguments(int *argc, const cha
- 			basis_dir[basis_dir_cnt++] = (char *)arg;
- 			break;
+   {"compress",        'z', POPT_ARG_NONE,   0, 'z', 0, 0 },
+   {"compress-level",   0,  POPT_ARG_INT,    &def_compress_level, 'z', 0, 0 },
+@@ -1057,6 +1060,21 @@ int parse_arguments(int *argc, const cha
+ 			usage(FINFO);
+ 			exit_cleanup(0);
  
 +                case OPT_LINK_BY_HASH:
 +#if HAVE_LINK
@@ -422,7 +422,7 @@ the file's name.
  		default:
  			/* A large opt value means that set_refuse_options()
  			 * turned this option off. */
-@@ -1573,6 +1591,11 @@ void server_options(char **args,int *arg
+@@ -1706,6 +1724,11 @@ void server_options(char **args,int *arg
  		}
  	}
  
@@ -434,7 +434,7 @@ the file's name.
  	if (files_from && (!am_sender || filesfrom_host)) {
  		if (filesfrom_host) {
  			args[ac++] = "--files-from";
---- orig/receiver.c	2005-09-16 05:41:02
+--- orig/receiver.c	2006-01-31 02:30:18
 +++ receiver.c	2005-01-15 21:29:13
 @@ -54,6 +54,7 @@ extern int delay_updates;
  extern struct stats stats;
@@ -444,7 +444,7 @@ the file's name.
  extern char *partial_dir;
  extern char *basis_dir[];
  extern struct file_list *the_file_list;
-@@ -187,12 +188,13 @@ static int get_tmpname(char *fnametmp, c
+@@ -186,12 +187,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;
-@@ -212,6 +214,9 @@ static int receive_data(int f_in, char *
+@@ -211,6 +213,9 @@ static int receive_data(int f_in, char *
  	} else
  		mapbuf = NULL;
  
@@ -469,7 +469,7 @@ the file's name.
  	sum_init(checksum_seed);
  
  	if (append_mode) {
-@@ -254,6 +259,8 @@ static int receive_data(int f_in, char *
+@@ -253,6 +258,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;
-@@ -280,6 +287,8 @@ static int receive_data(int f_in, char *
+@@ -279,6 +286,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) {
-@@ -320,6 +329,8 @@ static int receive_data(int f_in, char *
+@@ -319,6 +328,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);
-@@ -335,7 +346,7 @@ static int receive_data(int f_in, char *
+@@ -334,7 +345,7 @@ static int receive_data(int f_in, char *
  
  static void discard_receive_data(int f_in, OFF_T length)
  {
@@ -505,8 +505,8 @@ the file's name.
  }
  
  static void handle_delayed_updates(struct file_list *flist, char *local_name)
-@@ -669,8 +680,12 @@ int recv_files(int f_in, struct file_lis
- 			rprintf(FINFO, "%s\n", safe_fname(fname));
+@@ -666,8 +677,12 @@ int recv_files(int f_in, struct file_lis
+ 			rprintf(FINFO, "%s\n", fname);
  
  		/* recv file data */
 +#if HAVE_LINK
@@ -519,9 +519,9 @@ the file's name.
  
  		if (!log_before_transfer)
  			log_item(file, &initial_stats, iflags, NULL);
---- orig/rsync.c	2005-07-27 23:31:12
-+++ rsync.c	2005-02-21 11:04:36
-@@ -38,6 +38,7 @@ extern int inplace;
+--- orig/rsync.c	2006-01-31 02:30:18
++++ rsync.c	2006-01-30 07:19:44
+@@ -40,6 +40,7 @@ extern int inplace;
  extern int keep_dirlinks;
  extern int make_backups;
  extern struct stats stats;
@@ -529,23 +529,27 @@ the file's name.
  
  
  /*
-@@ -190,7 +191,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);
+@@ -213,8 +214,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);
+-	ret = robust_rename(fnametmp, fname, partialptr,
+-			    file->mode & INITACCESSPERMS);
 +#if HAVE_LINK
 +	if (link_by_hash_dir)
 +		ret = link_by_hash(fnametmp, fname, file);
 +	else
 +#endif
-+		ret = robust_rename(fnametmp, fname, file->mode & INITACCESSPERMS);
++	{
++		ret = robust_rename(fnametmp, fname, partialptr,
++				    file->mode & INITACCESSPERMS);
++	}
  	if (ret < 0) {
  		rsyserr(FERROR, errno, "%s %s -> \"%s\"",
- 		    ret == -2 ? "copy" : "rename",
---- orig/rsync.h	2005-10-14 18:45:50
-+++ rsync.h	2004-07-03 20:20:15
-@@ -644,6 +644,14 @@ struct stats {
+ 			ret == -2 ? "copy" : "rename",
+--- orig/rsync.h	2006-01-30 20:39:09
++++ rsync.h	2006-01-30 20:42:44
+@@ -640,6 +640,14 @@ struct stats {
  	int current_file_index;
  };
  
@@ -557,16 +561,16 @@ the file's name.
 +	uint32 nlink;
 +};
 +
+ struct chmod_mode_struct;
  
  #include "byteorder.h"
- #include "lib/mdfour.h"
---- orig/rsync.yo	2005-10-14 20:03:01
+--- orig/rsync.yo	2006-01-31 03:05:44
 +++ rsync.yo	2005-02-13 06:58:47
-@@ -355,6 +355,7 @@ to the detailed description below for a 
+@@ -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
       --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
+      --compress-level=NUM    explicitly set compression level
   -C, --cvs-exclude           auto-ignore files in the same way CVS does
-  -f, --filter=RULE           add a file-filtering RULE