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

diff --git a/link-by-hash.diff b/link-by-hash.diff
index 9e5ffac..9cc0144 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,9 +24,10 @@ 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
-@@ -67,6 +67,7 @@ extern int need_unsorted_flist;
+diff --git a/flist.c b/flist.c
+--- a/flist.c
++++ b/flist.c
+@@ -68,6 +68,7 @@ extern int need_unsorted_flist;
  extern int unsort_ndx;
  extern struct stats stats;
  extern char *filesfrom_host;
@@ -33,7 +35,7 @@ To use this patch, run these commands for a successful build:
  
  extern char curr_dir[MAXPATHLEN];
  
-@@ -815,7 +816,7 @@ static struct file_struct *recv_file_ent
+@@ -823,7 +824,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
  		extra_len += (S_ISDIR(mode) ? 2 : 1) * EXTRA_LEN;
  #endif
  
@@ -42,8 +44,10 @@ To use this patch, run these commands for a successful build:
  		extra_len += SUM_EXTRA_CNT * EXTRA_LEN;
  
  	if (file_length > 0xFFFFFFFFu && S_ISREG(mode))
---- old/hashlink.c
-+++ new/hashlink.c
+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
+@@ -155,6 +155,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)
+@@ -388,6 +389,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,7 +404,7 @@ 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
+@@ -440,7 +442,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,
@@ -408,7 +413,7 @@ To use this patch, run these commands for a successful build:
        OPT_SERVER, OPT_REFUSED_BASE = 9000};
  
  static struct poptOption long_options[] = {
-@@ -561,6 +563,7 @@ static struct poptOption long_options[] 
+@@ -563,6 +565,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 },
@@ -416,7 +421,7 @@ To use this patch, run these commands for a successful build:
    {"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
+@@ -1224,6 +1227,21 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
  			return 0;
  #endif
  
@@ -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
+@@ -1966,6 +1984,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
+@@ -162,12 +162,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 *
+@@ -187,6 +189,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 *
+@@ -231,6 +236,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 *
+@@ -257,6 +264,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);
@@ -496,7 +502,7 @@ To use this patch, run these commands for a successful build:
  		}
  
  		if (updating_basis_or_equiv) {
-@@ -299,6 +308,8 @@ static int receive_data(int f_in, char *
+@@ -299,6 +308,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 *
+@@ -314,7 +325,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)
-@@ -673,7 +684,7 @@ int recv_files(int f_in, char *local_nam
+@@ -673,7 +684,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,7 +540,7 @@ 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, 
+@@ -530,8 +531,15 @@ void 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);
@@ -549,11 +556,12 @@ To use this patch, run these commands for a successful build:
 +				    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 {
+diff --git a/rsync.h b/rsync.h
+--- a/rsync.h
++++ b/rsync.h
+@@ -817,6 +817,14 @@ struct stats {
  	int current_file_index;
  };
  
@@ -568,9 +576,10 @@ 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 
+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(
       --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