X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/87a38eea930df6ee2db0da2017c30116117b1d4b..e2bccb5999f9abc1e7657dc4d3186782f8ab3eee:/link-by-hash.diff diff --git a/link-by-hash.diff b/link-by-hash.diff index aace951..5d72765 100644 --- a/link-by-hash.diff +++ b/link-by-hash.diff @@ -17,7 +17,7 @@ To use this patch, run these commands for a successful build: @@ -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 + 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,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 -@@ -60,6 +60,7 @@ extern int copy_unsafe_links; +@@ -61,6 +61,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]; -@@ -747,7 +748,7 @@ static struct file_struct *recv_file_ent +@@ -748,7 +749,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 -@@ -145,6 +145,7 @@ char *backup_suffix = NULL; +@@ -146,6 +146,7 @@ char *backup_suffix = NULL; char *tmpdir = NULL; char *partial_dir = NULL; char *basis_dir[MAX_BASIS_DIRS+1]; @@ -391,7 +391,7 @@ To use this patch, run these commands for a successful build: char *config_file = NULL; char *shell_cmd = NULL; char *logfile_name = NULL; -@@ -355,6 +356,7 @@ void usage(enum logcode F) +@@ -362,6 +363,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 +399,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," -C, --cvs-exclude auto-ignore files the same way CVS does\n"); -@@ -404,7 +406,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP +@@ -411,7 +413,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, @@ -408,7 +408,7 @@ To use this patch, run these commands for a successful build: OPT_SERVER, OPT_REFUSED_BASE = 9000}; static struct poptOption long_options[] = { -@@ -513,6 +515,7 @@ static struct poptOption long_options[] +@@ -523,6 +525,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,10 +416,10 @@ 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 }, {"compress-level", 0, POPT_ARG_INT, &def_compress_level, 'z', 0, 0 }, -@@ -1127,6 +1130,21 @@ int parse_arguments(int *argc, const cha +@@ -1148,6 +1151,21 @@ int parse_arguments(int *argc, const cha + return 0; #endif - + case OPT_LINK_BY_HASH: +#ifdef HAVE_LINK + arg = poptGetOptArg(pc); @@ -438,7 +438,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. */ -@@ -1789,6 +1807,11 @@ void server_options(char **args,int *arg +@@ -1814,6 +1832,11 @@ void server_options(char **args,int *arg } } @@ -452,7 +452,7 @@ 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, @@ -468,7 +468,7 @@ To use this patch, run these commands for a successful build: 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 * +@@ -192,6 +197,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 * +@@ -218,6 +225,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) { -@@ -258,6 +267,8 @@ static int receive_data(int f_in, char * +@@ -260,6 +269,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); -@@ -273,7 +284,7 @@ static int receive_data(int f_in, char * +@@ -275,7 +286,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 +@@ -646,7 +657,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,7 +525,7 @@ To use this patch, run these commands for a successful build: --- old/rsync.c +++ new/rsync.c -@@ -50,6 +50,7 @@ extern int inplace; +@@ -51,6 +51,7 @@ extern int inplace; extern int flist_eof; extern int keep_dirlinks; extern int make_backups; @@ -533,7 +533,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; -@@ -401,8 +402,15 @@ void finish_transfer(char *fname, char * +@@ -410,8 +411,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 -@@ -756,6 +756,14 @@ struct stats { +@@ -758,6 +758,14 @@ struct stats { int current_file_index; }; @@ -570,7 +570,7 @@ 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 +@@ -369,6 +369,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