X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/99397a259069fc1ee876b6370e1ffe9cd29913be..0ef5abcbbb95298fa9faf1d3eb275a9e76e1d951:/link-by-hash.diff

diff --git a/link-by-hash.diff b/link-by-hash.diff
index ed365c4..ca447b4 100644
--- a/link-by-hash.diff
+++ b/link-by-hash.diff
@@ -12,9 +12,10 @@ To use this patch, run these commands for a successful build:
     ./configure
     make
 
---- old/Makefile.in
-+++ new/Makefile.in
-@@ -35,7 +35,7 @@ OBJS1=flist.o rsync.o generator.o receiv
+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
  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
@@ -23,27 +24,30 @@ To use this patch, run these commands for a successful build:
  DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o
  popt_OBJS=popt/findme.o  popt/popt.o  popt/poptconfig.o \
  	popt/popthelp.o popt/poptparse.o
---- old/flist.c
-+++ new/flist.c
-@@ -65,6 +65,7 @@ extern int protocol_version;
- extern int sanitize_paths;
+diff --git a/flist.c b/flist.c
+--- a/flist.c
++++ b/flist.c
+@@ -71,6 +71,7 @@ extern int sender_symlink_iconv;
+ extern int unsort_ndx;
  extern struct stats stats;
  extern char *filesfrom_host;
 +extern char *link_by_hash_dir;
- #ifdef ICONV_OPTION
- extern char *iconv_opt;
- #endif
-@@ -818,7 +819,7 @@ static struct file_struct *recv_file_ent
- 		extra_len += (S_ISDIR(mode) ? 2 : 1) * EXTRA_LEN;
+ 
+ extern char curr_dir[MAXPATHLEN];
+ 
+@@ -844,7 +845,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
+ 		extra_len += EXTRA_LEN;
  #endif
  
 -	if (always_checksum && S_ISREG(mode))
 +	if ((always_checksum || link_by_hash_dir) && S_ISREG(mode))
  		extra_len += SUM_EXTRA_CNT * EXTRA_LEN;
  
- 	if (file_length > 0xFFFFFFFFu && S_ISREG(mode))
---- old/hashlink.c
-+++ new/hashlink.c
+ #if SIZEOF_INT64 >= 8
+diff --git a/hashlink.c b/hashlink.c
+new file mode 100644
+--- /dev/null
++++ b/hashlink.c
 @@ -0,0 +1,336 @@
 +/*
 +   Copyright (C) Cronosys, LLC 2004
@@ -381,9 +385,10 @@ To use this patch, run these commands for a successful build:
 +	return rc;
 +}
 +#endif
---- old/options.c
-+++ new/options.c
-@@ -154,6 +154,7 @@ char *backup_suffix = NULL;
+diff --git a/options.c b/options.c
+--- a/options.c
++++ b/options.c
+@@ -157,6 +157,7 @@ char *backup_suffix = NULL;
  char *tmpdir = NULL;
  char *partial_dir = NULL;
  char *basis_dir[MAX_BASIS_DIRS+1];
@@ -391,7 +396,7 @@ To use this patch, run these commands for a successful build:
  char *config_file = NULL;
  char *shell_cmd = NULL;
  char *logfile_name = NULL;
-@@ -386,6 +387,7 @@ void usage(enum logcode F)
+@@ -395,6 +396,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");
@@ -399,24 +404,24 @@ To use this patch, run these commands for a successful build:
    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");
-@@ -438,7 +440,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP
+@@ -447,7 +449,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_D, OPT_APPEND, OPT_LINK_BY_HASH,
+-      OPT_NO_D, OPT_APPEND, OPT_NO_ICONV,
++      OPT_NO_D, OPT_APPEND, OPT_NO_ICONV, OPT_LINK_BY_HASH,
        OPT_SERVER, OPT_REFUSED_BASE = 9000};
  
  static struct poptOption long_options[] = {
-@@ -561,6 +563,7 @@ static struct poptOption long_options[] 
+@@ -579,6 +581,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 },
-   {"no-compress",      0,  POPT_ARG_VAL,    &do_compression, 0, 0, 0 },
-@@ -1221,6 +1224,21 @@ int parse_arguments(int *argc_p, const 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 },
+@@ -1261,6 +1264,21 @@ int parse_arguments(int *argc_p, const char ***argv_p)
  			return 0;
  #endif
  
@@ -424,7 +429,7 @@ To use this patch, run these commands for a successful build:
 +#ifdef HAVE_LINK
 +			arg = poptGetOptArg(pc);
 +			if (sanitize_paths)
-+				arg = sanitize_path(NULL, arg, NULL, 0, NULL);
++				arg = sanitize_path(NULL, arg, NULL, 0, SP_DEFAULT);
 +			link_by_hash_dir = (char *)arg;
 +			break;
 +#else
@@ -438,7 +443,7 @@ 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. */
-@@ -1963,6 +1981,11 @@ void server_options(char **args, int *ar
+@@ -2038,6 +2056,11 @@ void server_options(char **args, int *argc_p)
  	} else if (inplace)
  		args[ac++] = "--inplace";
  
@@ -450,9 +455,10 @@ To use this patch, run these commands for a successful build:
  	if (files_from && (!am_sender || filesfrom_host)) {
  		if (filesfrom_host) {
  			args[ac++] = "--files-from";
---- old/receiver.c
-+++ new/receiver.c
-@@ -162,12 +162,14 @@ int open_tmpfile(char *fnametmp, const c
+diff --git a/receiver.c b/receiver.c
+--- a/receiver.c
++++ b/receiver.c
+@@ -163,12 +163,14 @@ 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,
@@ -468,7 +474,7 @@ To use this patch, run these commands for a successful build:
  	int32 len, sum_len;
  	OFF_T offset = 0;
  	OFF_T offset2;
-@@ -187,6 +189,9 @@ static int receive_data(int f_in, char *
+@@ -188,6 +190,9 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
  	} else
  		mapbuf = NULL;
  
@@ -478,7 +484,7 @@ To use this patch, run these commands for a successful build:
  	sum_init(checksum_seed);
  
  	if (append_mode > 0) {
-@@ -231,6 +236,8 @@ static int receive_data(int f_in, char *
+@@ -232,6 +237,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);
@@ -487,7 +493,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;
-@@ -257,6 +264,8 @@ static int receive_data(int f_in, char *
+@@ -258,6 +265,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);
@@ -495,8 +501,8 @@ To use this patch, run these commands for a successful build:
 +				mdfour_update(&mdfour_data, (uchar*)map, len);
  		}
  
- 		if (updating_basis) {
-@@ -299,6 +308,8 @@ static int receive_data(int f_in, char *
+ 		if (updating_basis_or_equiv) {
+@@ -303,6 +312,8 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
  	}
  
  	sum_len = sum_end(file_sum1);
@@ -505,7 +511,7 @@ To use this patch, run these commands for a successful build:
  
  	if (mapbuf)
  		unmap_file(mapbuf);
-@@ -314,7 +325,7 @@ static int receive_data(int f_in, char *
+@@ -318,7 +329,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)
  {
@@ -514,7 +520,7 @@ To use this patch, run these commands for a successful build:
  }
  
  static void handle_delayed_updates(char *local_name)
-@@ -667,7 +678,7 @@ int recv_files(int f_in, char *local_nam
+@@ -708,7 +719,7 @@ int recv_files(int f_in, char *local_name)
  
  		/* recv file data */
  		recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size,
@@ -523,8 +529,9 @@ To use this patch, run these commands for a successful build:
  
  		log_item(log_code, file, &initial_stats, iflags, NULL);
  
---- old/rsync.c
-+++ new/rsync.c
+diff --git a/rsync.c b/rsync.c
+--- a/rsync.c
++++ b/rsync.c
 @@ -48,6 +48,7 @@ extern int inplace;
  extern int flist_eof;
  extern int keep_dirlinks;
@@ -533,11 +540,11 @@ To use this patch, run these commands for a successful build:
  extern struct file_list *cur_flist, *first_flist, *dir_flist;
  extern struct chmod_mode_struct *daemon_chmod_modes;
  #ifdef ICONV_OPTION
-@@ -530,8 +531,15 @@ void finish_transfer(const char *fname, 
+@@ -578,8 +579,15 @@ int finish_transfer(const char *fname, const char *fnametmp,
  	/* move tmp file over real file */
  	if (verbose > 2)
  		rprintf(FINFO, "renaming %s to %s\n", fnametmp, fname);
--	ret = robust_rename(fnametmp, fname, partialptr,
+-	ret = robust_rename(fnametmp, fname, temp_copy_name,
 -			    file->mode & INITACCESSPERMS);
 +#ifdef HAVE_LINK
 +	if (link_by_hash_dir)
@@ -545,16 +552,17 @@ To use this patch, run these commands for a successful build:
 +	else
 +#endif
 +	{
-+		ret = robust_rename(fnametmp, fname, partialptr,
++		ret = robust_rename(fnametmp, fname, temp_copy_name,
 +				    file->mode & INITACCESSPERMS);
 +	}
  	if (ret < 0) {
- 		rsyserr(FERROR, errno, "%s %s -> \"%s\"",
+ 		rsyserr(FERROR_XFER, errno, "%s %s -> \"%s\"",
  			ret == -2 ? "copy" : "rename",
---- old/rsync.h
-+++ new/rsync.h
-@@ -807,6 +807,14 @@ struct stats {
- 	int current_file_index;
+diff --git a/rsync.h b/rsync.h
+--- a/rsync.h
++++ b/rsync.h
+@@ -830,6 +830,14 @@ struct stats {
+ 	int num_transferred_files;
  };
  
 +struct hashfile_struct {
@@ -567,10 +575,11 @@ To use this patch, run these commands for a successful build:
 +
  struct chmod_mode_struct;
  
- #define EMPTY_ITEM_LIST {NULL, 0, 0}
---- old/rsync.yo
-+++ new/rsync.yo
-@@ -387,6 +387,7 @@ to the detailed description below for a 
+ struct flist_ndx_item {
+diff --git a/rsync.yo b/rsync.yo
+--- a/rsync.yo
++++ b/rsync.yo
+@@ -392,6 +392,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