X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/ae306a2933c7617493d80f46d891911634ec43d0..c1ff70aa47e11c5b37634479a0facee775a7b6d9:/link-by-hash.diff

diff --git a/link-by-hash.diff b/link-by-hash.diff
index 97d7f1d..53fff8f 100644
--- a/link-by-hash.diff
+++ b/link-by-hash.diff
@@ -12,11 +12,12 @@ To use this patch, run these commands for a successful build:
     ./configure
     make
 
+based-on: a01e3b490eb36ccf9e704840e1b6683dab867550
 diff --git a/Makefile.in b/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -36,7 +36,7 @@ OBJS1=flist.o rsync.o generator.o receiver.o cleanup.o sender.o exclude.o \
- 	util.o main.o checksum.o match.o syscall.o log.o backup.o
+@@ -37,7 +37,7 @@ OBJS1=flist.o rsync.o generator.o receiver.o cleanup.o sender.o exclude.o \
+ 	util.o main.o checksum.o match.o syscall.o log.o backup.o delete.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
@@ -27,15 +28,15 @@ diff --git a/Makefile.in b/Makefile.in
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c
-@@ -71,6 +71,7 @@ extern int sender_symlink_iconv;
+@@ -74,6 +74,7 @@ extern int sender_keeps_checksum;
  extern int unsort_ndx;
  extern struct stats stats;
  extern char *filesfrom_host;
 +extern char *link_by_hash_dir;
+ extern char *usermap, *groupmap;
  
  extern char curr_dir[MAXPATHLEN];
- 
-@@ -844,7 +845,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
+@@ -910,7 +911,7 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
  		extra_len += EXTRA_LEN;
  #endif
  
@@ -48,7 +49,7 @@ diff --git a/hashlink.c b/hashlink.c
 new file mode 100644
 --- /dev/null
 +++ b/hashlink.c
-@@ -0,0 +1,336 @@
+@@ -0,0 +1,339 @@
 +/*
 +   Copyright (C) Cronosys, LLC 2004
 +
@@ -96,7 +97,8 @@ new file mode 100644
 +	}
 +	*dst = 0;
 +
-+	asprintf(&dst,"%s/%s",link_by_hash_dir,hash);
++	if (asprintf(&dst,"%s/%s",link_by_hash_dir,hash) < 0)
++		out_of_memory("make_hash_name");
 +	return dst;
 +}
 +
@@ -153,8 +155,8 @@ new file mode 100644
 +			*fnbr = this_fnbr;
 +
 +		hashfile = new_array(struct hashfile_struct, 1);
-+		asprintf(&hashfile->name,"%s/%s",hashname,
-+			 di->d_name);
++		if (asprintf(&hashfile->name,"%s/%s",hashname, di->d_name) < 0)
++			out_of_memory("find_hashfiles");
 +		if (do_stat(hashfile->name,&st) == -1) {
 +			rsyserr(FERROR, errno, "stat failed: %s", hashfile->name);
 +			kill_hashfile(hashfile);
@@ -300,7 +302,8 @@ new file mode 100644
 +		}
 +
 +		first = 1;
-+		asprintf(&linkname,"%s/0",hashname);
++		if (asprintf(&linkname,"%s/0",hashname) < 0)
++			out_of_memory("link_by_hash");
 +		rprintf(FINFO, "(1) linkname = %s\n", linkname);
 +	} else {
 +		struct hashfile_struct *hashfiles, *hashfile;
@@ -313,7 +316,8 @@ new file mode 100644
 +
 +		if (hashfiles == NULL) {
 +			first = 1;
-+			asprintf(&linkname,"%s/0",hashname);
++			if (asprintf(&linkname,"%s/0",hashname) < 0)
++				out_of_memory("link_by_hash");
 +			rprintf(FINFO, "(2) linkname = %s\n", linkname);
 +		} else {
 +			int fd;
@@ -334,8 +338,8 @@ new file mode 100644
 +				kill_hashfile(hashfile);
 +			} else {
 +				first = 1;
-+				asprintf(&linkname, "%s/%ld", hashname,
-+					 last_fnbr + 1);
++				if (asprintf(&linkname, "%s/%ld", hashname, last_fnbr + 1) < 0)
++					out_of_memory("link_by_hash");
 +				rprintf(FINFO, "(4) linkname = %s\n", linkname);
 +			}
 +		}
@@ -350,8 +354,8 @@ new file mode 100644
 +			if (errno == EMLINK) {
 +				first = 1;
 +				free(linkname);
-+				asprintf(&linkname,"%s/%ld",hashname,
-+					 last_fnbr + 1);
++				if (asprintf(&linkname,"%s/%ld",hashname, last_fnbr + 1) < 0)
++					out_of_memory("link_by_hash");
 +				rprintf(FINFO, "(5) linkname = %s\n", linkname);
 +				rprintf(FINFO,"link-by-hash: max link count exceeded, starting new file \"%s\".\n", linkname);
 +			} else {
@@ -388,7 +392,7 @@ new file mode 100644
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
-@@ -157,6 +157,7 @@ char *backup_suffix = NULL;
+@@ -158,6 +158,7 @@ char *backup_suffix = NULL;
  char *tmpdir = NULL;
  char *partial_dir = NULL;
  char *basis_dir[MAX_BASIS_DIRS+1];
@@ -396,7 +400,7 @@ diff --git a/options.c b/options.c
  char *config_file = NULL;
  char *shell_cmd = NULL;
  char *logfile_name = NULL;
-@@ -394,6 +395,7 @@ void usage(enum logcode F)
+@@ -746,6 +747,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");
@@ -404,16 +408,16 @@ diff --git a/options.c b/options.c
    rprintf(F," -z, --compress              compress file data during the transfer\n");
    rprintf(F,"     --compress-level=NUM    explicitly set compression level\n");
    rprintf(F,"     --skip-compress=LIST    skip compressing files with a suffix in LIST\n");
-@@ -446,7 +448,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
+@@ -798,7 +800,7 @@ 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_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_APPEND, OPT_NO_ICONV,
-+      OPT_NO_D, OPT_APPEND, OPT_NO_ICONV, OPT_LINK_BY_HASH,
+-      OPT_NO_D, OPT_APPEND, OPT_NO_ICONV, OPT_INFO, OPT_DEBUG,
++      OPT_NO_D, OPT_APPEND, OPT_NO_ICONV, OPT_INFO, OPT_DEBUG, OPT_LINK_BY_HASH,
+       OPT_USERMAP, OPT_GROUPMAP, OPT_CHOWN, OPT_BWLIMIT,
        OPT_SERVER, OPT_REFUSED_BASE = 9000};
  
- static struct poptOption long_options[] = {
-@@ -578,6 +580,7 @@ static struct poptOption long_options[] = {
+@@ -938,6 +940,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 },
@@ -421,7 +425,7 @@ diff --git a/options.c b/options.c
    {"fuzzy",           'y', POPT_ARG_VAL,    &fuzzy_basis, 1, 0, 0 },
    {"no-fuzzy",         0,  POPT_ARG_VAL,    &fuzzy_basis, 0, 0, 0 },
    {"no-y",             0,  POPT_ARG_VAL,    &fuzzy_basis, 0, 0, 0 },
-@@ -1260,6 +1263,21 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -1764,6 +1767,21 @@ int parse_arguments(int *argc_p, const char ***argv_p)
  			return 0;
  #endif
  
@@ -443,7 +447,7 @@ diff --git a/options.c b/options.c
  		default:
  			/* A large opt value means that set_refuse_options()
  			 * turned this option off. */
-@@ -2036,6 +2054,11 @@ void server_options(char **args, int *argc_p)
+@@ -2636,6 +2654,11 @@ void server_options(char **args, int *argc_p)
  	} else if (inplace)
  		args[ac++] = "--inplace";
  
@@ -458,7 +462,7 @@ diff --git a/options.c b/options.c
 diff --git a/receiver.c b/receiver.c
 --- a/receiver.c
 +++ b/receiver.c
-@@ -162,12 +162,14 @@ int open_tmpfile(char *fnametmp, const char *fname, struct file_struct *file)
+@@ -196,11 +196,13 @@ int open_tmpfile(char *fnametmp, const char *fname, struct file_struct *file)
  }
  
  static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
@@ -467,14 +471,13 @@ diff --git a/receiver.c b/receiver.c
 +			const char *md4)
  {
  	static char file_sum1[MAX_DIGEST_LEN];
- 	static char file_sum2[MAX_DIGEST_LEN];
  	struct map_struct *mapbuf;
  	struct sum_struct sum;
 +	md_context mdfour_data;
- 	int32 len, sum_len;
+ 	int32 len;
  	OFF_T offset = 0;
  	OFF_T offset2;
-@@ -187,6 +189,9 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
+@@ -220,6 +222,9 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
  	} else
  		mapbuf = NULL;
  
@@ -484,7 +487,7 @@ diff --git a/receiver.c b/receiver.c
  	sum_init(checksum_seed);
  
  	if (append_mode > 0) {
-@@ -231,6 +236,8 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
+@@ -264,6 +269,8 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
  			cleanup_got_literal = 1;
  
  			sum_update(data, i);
@@ -493,7 +496,7 @@ diff --git a/receiver.c b/receiver.c
  
  			if (fd != -1 && write_file(fd,data,i) != i)
  				goto report_write_error;
-@@ -257,6 +264,8 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
+@@ -290,6 +297,8 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
  
  			see_token(map, len);
  			sum_update(map, len);
@@ -502,16 +505,17 @@ diff --git a/receiver.c b/receiver.c
  		}
  
  		if (updating_basis_or_equiv) {
-@@ -299,6 +308,8 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
- 	}
+@@ -337,6 +346,9 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
+ 	if (sum_end(file_sum1) != checksum_len)
+ 		overflow_exit("checksum_len"); /* Impossible... */
  
- 	sum_len = sum_end(file_sum1);
 +	if (md4)
 +		mdfour_result(&mdfour_data, (uchar*)md4);
- 
++
  	if (mapbuf)
  		unmap_file(mapbuf);
-@@ -314,7 +325,7 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
+ 
+@@ -351,7 +363,7 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
  
  static void discard_receive_data(int f_in, OFF_T length)
  {
@@ -520,29 +524,29 @@ diff --git a/receiver.c b/receiver.c
  }
  
  static void handle_delayed_updates(char *local_name)
-@@ -676,7 +687,7 @@ int recv_files(int f_in, char *local_name)
+@@ -779,7 +791,7 @@ int recv_files(int f_in, int f_out, char *local_name)
  
  		/* recv file data */
  		recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size,
 -				       fname, fd2, F_LENGTH(file));
 +				       fname, fd2, F_LENGTH(file), F_SUM(file));
  
- 		log_item(log_code, file, &initial_stats, iflags, NULL);
+ 		log_item(log_code, file, iflags, NULL);
  
 diff --git a/rsync.c b/rsync.c
 --- a/rsync.c
 +++ b/rsync.c
-@@ -50,6 +50,7 @@ extern int keep_dirlinks;
+@@ -49,6 +49,7 @@ extern int flist_eof;
+ extern int file_old_total;
+ extern int keep_dirlinks;
  extern int make_backups;
- extern int delete_during;
- extern int check_for_io_err;
 +extern char *link_by_hash_dir;
  extern struct file_list *cur_flist, *first_flist, *dir_flist;
  extern struct chmod_mode_struct *daemon_chmod_modes;
  #ifdef ICONV_OPTION
-@@ -588,8 +589,15 @@ int finish_transfer(const char *fname, const char *fnametmp,
+@@ -644,8 +645,15 @@ int finish_transfer(const char *fname, const char *fnametmp,
  	/* move tmp file over real file */
- 	if (verbose > 2)
+ 	if (DEBUG_GTE(RECV, 1))
  		rprintf(FINFO, "renaming %s to %s\n", fnametmp, fname);
 -	ret = robust_rename(fnametmp, fname, temp_copy_name,
 -			    file->mode & INITACCESSPERMS);
@@ -561,8 +565,8 @@ diff --git a/rsync.c b/rsync.c
 diff --git a/rsync.h b/rsync.h
 --- a/rsync.h
 +++ b/rsync.h
-@@ -830,6 +830,14 @@ struct stats {
- 	int num_transferred_files;
+@@ -865,6 +865,14 @@ struct stats {
+ 	int xferred_files;
  };
  
 +struct hashfile_struct {
@@ -575,11 +579,11 @@ diff --git a/rsync.h b/rsync.h
 +
  struct chmod_mode_struct;
  
- #define EMPTY_ITEM_LIST {NULL, 0, 0}
+ struct flist_ndx_item {
 diff --git a/rsync.yo b/rsync.yo
 --- a/rsync.yo
 +++ b/rsync.yo
-@@ -388,6 +388,7 @@ to the detailed description below for a complete description.  verb(
+@@ -400,6 +400,7 @@ to the detailed description below for a complete description.  verb(
       --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