X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/0b2c07a0f162b8704df278209b4de836f1c846de..5ba66156c2f3b31eae4a1ae88a44c1efaf248c9c:/link-by-hash.diff

diff --git a/link-by-hash.diff b/link-by-hash.diff
index 5d72765..9532c5b 100644
--- a/link-by-hash.diff
+++ b/link-by-hash.diff
@@ -25,7 +25,7 @@ To use this patch, run these commands for a successful build:
  	popt/popthelp.o popt/poptparse.o
 --- old/flist.c
 +++ new/flist.c
-@@ -61,6 +61,7 @@ extern int copy_unsafe_links;
+@@ -63,6 +63,7 @@ extern int copy_unsafe_links;
  extern int protocol_version;
  extern int sanitize_paths;
  extern struct stats stats;
@@ -33,7 +33,7 @@ To use this patch, run these commands for a successful build:
  
  extern char curr_dir[MAXPATHLEN];
  
-@@ -748,7 +749,7 @@ static struct file_struct *recv_file_ent
+@@ -818,7 +819,7 @@ static struct file_struct *recv_file_ent
  		extra_len += (S_ISDIR(mode) ? 2 : 1) * EXTRA_LEN;
  #endif
  
@@ -383,7 +383,7 @@ To use this patch, run these commands for a successful build:
 +#endif
 --- old/options.c
 +++ new/options.c
-@@ -146,6 +146,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,32 +391,32 @@ To use this patch, run these commands for a successful build:
  char *config_file = NULL;
  char *shell_cmd = NULL;
  char *logfile_name = NULL;
-@@ -362,6 +363,7 @@ void usage(enum logcode F)
+@@ -384,6 +385,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");
-@@ -411,7 +413,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP
+   rprintf(F,"     --skip-compress=LIST    skip compressing files with a suffix in LIST\n");
+@@ -435,7 +437,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[] = {
-@@ -523,6 +525,7 @@ static struct poptOption long_options[] 
+@@ -554,6 +556,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 },
-@@ -1148,6 +1151,21 @@ int parse_arguments(int *argc, const cha
+   {"no-compress",      0,  POPT_ARG_VAL,    &do_compression, 0, 0, 0 },
+@@ -1205,6 +1208,21 @@ int parse_arguments(int *argc, const cha
  			return 0;
  #endif
  
@@ -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. */
-@@ -1814,6 +1832,11 @@ void server_options(char **args,int *arg
- 		}
- 	}
+@@ -1929,6 +1947,11 @@ void server_options(char **args,int *arg
+ 	} else if (inplace)
+ 		args[ac++] = "--inplace";
  
 +	if (link_by_hash_dir && am_sender) {
 +		args[ac++] = "--link-by-hash";
@@ -478,7 +478,7 @@ To use this patch, run these commands for a successful build:
  	sum_init(checksum_seed);
  
  	if (append_mode > 0) {
-@@ -192,6 +197,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;
-@@ -218,6 +225,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,7 +496,7 @@ To use this patch, run these commands for a successful build:
  		}
  
  		if (updating_basis) {
-@@ -260,6 +269,8 @@ static int receive_data(int f_in, char *
+@@ -262,6 +271,8 @@ static int receive_data(int f_in, char *
  	}
  
  	sum_len = sum_end(file_sum1);
@@ -505,7 +505,7 @@ To use this patch, run these commands for a successful build:
  
  	if (mapbuf)
  		unmap_file(mapbuf);
-@@ -275,7 +286,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)
-@@ -646,7 +657,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
-@@ -51,6 +51,7 @@ extern int inplace;
+@@ -48,6 +48,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;
- 
-@@ -410,8 +411,15 @@ void finish_transfer(const char *fname, 
+ #ifdef ICONV_OPTION
+@@ -458,8 +459,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 {
+@@ -778,6 +778,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
-@@ -369,6 +369,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