X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/ffc188460d94afdf8da233d822e7312e676b146a..6240d1e484dd4e3cc4d0dad8d47d58193354784e:/link-by-hash.diff

diff --git a/link-by-hash.diff b/link-by-hash.diff
index 3a8debd..b6b7802 100644
--- a/link-by-hash.diff
+++ b/link-by-hash.diff
@@ -16,8 +16,8 @@ To use this patch, run these commands for a successful build:
 +++ new/Makefile.in
 @@ -35,7 +35,7 @@ OBJS1=flist.o rsync.o generator.o receiv
  	util.o main.o checksum.o match.o syscall.o log.o backup.o
- OBJS2=options.o io.o compat.o hlink.o token.o uidlist.o socket.o \
- 	fileio.o batch.o clientname.o chmod.o acls.o
+ OBJS2=options.o io.o compat.o hlink.o token.o uidlist.o socket.o hashtable.o \
+ 	fileio.o batch.o clientname.o chmod.o acls.o xattrs.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
@@ -25,15 +25,15 @@ To use this patch, run these commands for a successful build:
  	popt/popthelp.o popt/poptparse.o
 --- old/flist.c
 +++ new/flist.c
-@@ -60,6 +60,7 @@ extern int copy_unsafe_links;
- extern int protocol_version;
+@@ -65,6 +65,7 @@ extern int protocol_version;
  extern int sanitize_paths;
  extern struct stats stats;
+ extern char *filesfrom_host;
 +extern char *link_by_hash_dir;
  
  extern char curr_dir[MAXPATHLEN];
  
-@@ -724,7 +725,7 @@ static struct file_struct *recv_file_ent
+@@ -830,7 +831,7 @@ static struct file_struct *recv_file_ent
  		extra_len += (S_ISDIR(mode) ? 2 : 1) * EXTRA_LEN;
  #endif
  
@@ -264,7 +264,7 @@ To use this patch, run these commands for a successful build:
 +}
 +
 +
-+int link_by_hash(char *fnametmp,char *fname,struct file_struct *file)
++int link_by_hash(const char *fnametmp, const char *fname, struct file_struct *file)
 +{
 +	STRUCT_STAT st;
 +	char *hashname = make_hash_name(file);
@@ -383,7 +383,7 @@ To use this patch, run these commands for a successful build:
 +#endif
 --- old/options.c
 +++ new/options.c
-@@ -144,6 +144,7 @@ char *backup_suffix = NULL;
+@@ -153,6 +153,7 @@ char *backup_suffix = NULL;
  char *tmpdir = NULL;
  char *partial_dir = NULL;
  char *basis_dir[MAX_BASIS_DIRS+1];
@@ -391,35 +391,35 @@ To use this patch, run these commands for a successful build:
  char *config_file = NULL;
  char *shell_cmd = NULL;
  char *logfile_name = NULL;
-@@ -354,6 +355,7 @@ void usage(enum logcode F)
+@@ -385,6 +386,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");
-@@ -403,7 +405,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP
+   rprintf(F,"     --skip-compress=LIST    skip compressing files with a suffix in LIST\n");
+@@ -437,7 +439,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_NO_D,
-+      OPT_NO_D, OPT_LINK_BY_HASH,
+-      OPT_NO_D, OPT_APPEND,
++      OPT_NO_D, OPT_APPEND, OPT_LINK_BY_HASH,
        OPT_SERVER, OPT_REFUSED_BASE = 9000};
  
  static struct poptOption long_options[] = {
-@@ -508,6 +510,7 @@ static struct poptOption long_options[] 
+@@ -561,6 +563,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,   0, 'z', 0, 0 },
-   {"compress-level",   0,  POPT_ARG_INT,    &def_compress_level, 'z', 0, 0 },
-@@ -1122,6 +1125,21 @@ int parse_arguments(int *argc, const cha
+   {"no-compress",      0,  POPT_ARG_VAL,    &do_compression, 0, 0, 0 },
+@@ -1219,6 +1222,21 @@ int parse_arguments(int *argc_p, const c
+ 			return 0;
  #endif
  
- 
 +                case OPT_LINK_BY_HASH:
 +#ifdef HAVE_LINK
 +			arg = poptGetOptArg(pc);
@@ -438,9 +438,9 @@ To use this patch, run these commands for a successful build:
  		default:
  			/* A large opt value means that set_refuse_options()
  			 * turned this option off. */
-@@ -1784,6 +1802,11 @@ void server_options(char **args,int *arg
- 		}
- 	}
+@@ -1965,6 +1983,11 @@ void server_options(char **args, int *ar
+ 	} else if (inplace)
+ 		args[ac++] = "--inplace";
  
 +	if (link_by_hash_dir && am_sender) {
 +		args[ac++] = "--link-by-hash";
@@ -452,23 +452,23 @@ To use this patch, run these commands for a successful build:
  			args[ac++] = "--files-from";
 --- old/receiver.c
 +++ new/receiver.c
-@@ -123,12 +123,14 @@ int get_tmpname(char *fnametmp, char *fn
+@@ -125,12 +125,14 @@ int get_tmpname(char *fnametmp, char *fn
  
  
  static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
--			char *fname, int fd, OFF_T total_size)
+-			const char *fname, int fd, OFF_T total_size)
 +			const char *fname, int fd, OFF_T total_size,
 +			const char *md4)
  {
- 	static char file_sum1[MD4_SUM_LENGTH];
- 	static char file_sum2[MD4_SUM_LENGTH];
+ 	static char file_sum1[MAX_DIGEST_LEN];
+ 	static char file_sum2[MAX_DIGEST_LEN];
  	struct map_struct *mapbuf;
  	struct sum_struct sum;
-+	struct mdfour mdfour_data;
- 	int32 len;
++	md_context mdfour_data;
+ 	int32 len, sum_len;
  	OFF_T offset = 0;
  	OFF_T offset2;
-@@ -148,6 +150,9 @@ static int receive_data(int f_in, char *
+@@ -150,6 +152,9 @@ static int receive_data(int f_in, char *
  	} else
  		mapbuf = NULL;
  
@@ -478,7 +478,7 @@ To use this patch, run these commands for a successful build:
  	sum_init(checksum_seed);
  
  	if (append_mode > 0) {
-@@ -190,6 +195,8 @@ static int receive_data(int f_in, char *
+@@ -194,6 +199,8 @@ static int receive_data(int f_in, char *
  			cleanup_got_literal = 1;
  
  			sum_update(data, i);
@@ -487,7 +487,7 @@ To use this patch, run these commands for a successful build:
  
  			if (fd != -1 && write_file(fd,data,i) != i)
  				goto report_write_error;
-@@ -216,6 +223,8 @@ static int receive_data(int f_in, char *
+@@ -220,6 +227,8 @@ static int receive_data(int f_in, char *
  
  			see_token(map, len);
  			sum_update(map, len);
@@ -496,16 +496,16 @@ To use this patch, run these commands for a successful build:
  		}
  
  		if (updating_basis) {
-@@ -258,6 +267,8 @@ static int receive_data(int f_in, char *
+@@ -262,6 +271,8 @@ static int receive_data(int f_in, char *
  	}
  
- 	sum_end(file_sum1);
+ 	sum_len = sum_end(file_sum1);
 +	if (md4)
-+		mdfour_result(&mdfour_data, (unsigned char*)md4);
++		mdfour_result(&mdfour_data, (uchar*)md4);
  
  	if (mapbuf)
  		unmap_file(mapbuf);
-@@ -273,7 +284,7 @@ static int receive_data(int f_in, char *
+@@ -277,7 +288,7 @@ static int receive_data(int f_in, char *
  
  static void discard_receive_data(int f_in, OFF_T length)
  {
@@ -514,7 +514,7 @@ To use this patch, run these commands for a successful build:
  }
  
  static void handle_delayed_updates(char *local_name)
-@@ -635,7 +646,7 @@ int recv_files(int f_in, char *local_nam
+@@ -665,7 +676,7 @@ int recv_files(int f_in, char *local_nam
  
  		/* recv file data */
  		recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size,
@@ -525,15 +525,15 @@ To use this patch, run these commands for a successful build:
  
 --- old/rsync.c
 +++ new/rsync.c
-@@ -50,6 +50,7 @@ extern int inplace;
+@@ -47,6 +47,7 @@ extern int inplace;
  extern int flist_eof;
  extern int keep_dirlinks;
  extern int make_backups;
 +extern char *link_by_hash_dir;
  extern struct file_list *cur_flist, *first_flist, *dir_flist;
  extern struct chmod_mode_struct *daemon_chmod_modes;
- 
-@@ -401,8 +402,15 @@ void finish_transfer(char *fname, char *
+ #ifdef ICONV_OPTION
+@@ -529,8 +530,15 @@ void finish_transfer(const char *fname, 
  	/* move tmp file over real file */
  	if (verbose > 2)
  		rprintf(FINFO, "renaming %s to %s\n", fnametmp, fname);
@@ -553,7 +553,7 @@ To use this patch, run these commands for a successful build:
  			ret == -2 ? "copy" : "rename",
 --- old/rsync.h
 +++ new/rsync.h
-@@ -758,6 +758,14 @@ struct stats {
+@@ -768,6 +768,14 @@ struct stats {
  	int current_file_index;
  };
  
@@ -570,11 +570,11 @@ To use this patch, run these commands for a successful build:
  #define EMPTY_ITEM_LIST {NULL, 0, 0}
 --- old/rsync.yo
 +++ new/rsync.yo
-@@ -368,6 +368,7 @@ to the detailed description below for a 
+@@ -392,6 +392,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
+      --skip-compress=LIST    skip compressing files with suffix in LIST