X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/18ae7b8789354cbf9ebac5a94796e7c17dd8df83..ff55cce0a8b6abecf86ffd55a2eb3bf97a79dd7e:/link-by-hash.diff diff --git a/link-by-hash.diff b/link-by-hash.diff index 8e79882..946acc0 100644 --- a/link-by-hash.diff +++ b/link-by-hash.diff @@ -11,9 +11,9 @@ will only store one copy of the unique contents of each file, regardless of the file's name. ---- orig/Makefile.in 2004-11-02 16:47:15 +--- orig/Makefile.in 2005-07-07 23:11:07 +++ Makefile.in 2004-07-03 20:20:15 -@@ -35,7 +35,7 @@ OBJS1=rsync.o generator.o receiver.o cle +@@ -34,7 +34,7 @@ OBJS1=rsync.o generator.o receiver.o cle main.o checksum.o match.o syscall.o log.o backup.o OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o \ fileio.o batch.o clientname.o @@ -130,7 +130,7 @@ the file's name. + if (this_fnbr > *fnbr) + *fnbr = this_fnbr; + -+ hashfile = (struct hashfile_struct*)malloc(sizeof(struct hashfile_struct)); ++ hashfile = new_array(struct hashfile_struct, 1); + asprintf(&hashfile->name,"%s/%s",hashname, + di->d_name); + if (do_stat(hashfile->name,&st) == -1) { @@ -365,9 +365,9 @@ the file's name. +} + +#endif ---- orig/options.c 2005-03-31 00:24:21 -+++ options.c 2005-03-01 01:27:55 -@@ -140,6 +140,7 @@ char *log_format = NULL; +--- orig/options.c 2005-08-27 21:11:26 ++++ options.c 2005-05-19 08:55:42 +@@ -141,6 +141,7 @@ char *log_format = NULL; char *password_file = NULL; char *rsync_path = RSYNC_PATH; char *backup_dir = NULL; @@ -375,7 +375,7 @@ the file's name. char backup_dir_buf[MAXPATHLEN]; int rsync_port = 0; int compare_dest = 0; -@@ -320,6 +321,7 @@ void usage(enum logcode F) +@@ -322,6 +323,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"); @@ -383,24 +383,24 @@ the file's name. rprintf(F," -z, --compress compress file data during the transfer\n"); rprintf(F," -C, --cvs-exclude auto-ignore files the same way CVS does\n"); rprintf(F," -f, --filter=RULE add a file-filtering RULE\n"); -@@ -360,7 +362,7 @@ void usage(enum logcode F) +@@ -362,7 +364,7 @@ void usage(enum logcode F) + 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_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, -- OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT, OPT_MAX_SIZE, -+ OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT, OPT_MAX_SIZE, OPT_LINK_BY_HASH, +- OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, ++ OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, OPT_LINK_BY_HASH, + OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH, OPT_MAX_SIZE, OPT_REFUSED_BASE = 9000}; - static struct poptOption long_options[] = { -@@ -429,6 +431,7 @@ static struct poptOption long_options[] +@@ -446,6 +448,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 }, - /* TODO: Should this take an optional int giving the compression level? */ {"compress", 'z', POPT_ARG_NONE, &do_compression, 0, 0, 0 }, -@@ -863,6 +866,21 @@ int parse_arguments(int *argc, const cha + {0, 'P', POPT_ARG_NONE, 0, 'P', 0, 0 }, +@@ -916,6 +919,21 @@ int parse_arguments(int *argc, const cha basis_dir[basis_dir_cnt++] = (char *)arg; break; @@ -422,7 +422,7 @@ the file's name. default: /* A large opt value means that set_refuse_options() * turned this option off. */ -@@ -1438,6 +1456,11 @@ void server_options(char **args,int *arg +@@ -1507,6 +1525,11 @@ void server_options(char **args,int *arg } } @@ -434,9 +434,9 @@ the file's name. if (files_from && (!am_sender || filesfrom_host)) { if (filesfrom_host) { args[ac++] = "--files-from"; ---- orig/receiver.c 2005-03-29 22:39:37 +--- orig/receiver.c 2005-08-17 06:45:08 +++ receiver.c 2005-01-15 21:29:13 -@@ -51,6 +51,7 @@ extern int delay_updates; +@@ -53,6 +53,7 @@ extern int delay_updates; extern struct stats stats; extern char *log_format; extern char *tmpdir; @@ -444,7 +444,7 @@ the file's name. extern char *partial_dir; extern char *basis_dir[]; extern struct file_list *the_file_list; -@@ -184,12 +185,13 @@ static int get_tmpname(char *fnametmp, c +@@ -186,12 +187,13 @@ static int get_tmpname(char *fnametmp, c static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r, @@ -459,7 +459,7 @@ the file's name. int32 len; OFF_T offset = 0; OFF_T offset2; -@@ -209,6 +211,9 @@ static int receive_data(int f_in, char * +@@ -211,6 +213,9 @@ static int receive_data(int f_in, char * } else mapbuf = NULL; @@ -468,8 +468,8 @@ the file's name. + sum_init(checksum_seed); - while ((i = recv_token(f_in, &data)) != 0) { -@@ -225,6 +230,8 @@ static int receive_data(int f_in, char * + if (append_mode) { +@@ -253,6 +258,8 @@ static int receive_data(int f_in, char * cleanup_got_literal = 1; sum_update(data, i); @@ -478,7 +478,7 @@ the file's name. if (fd != -1 && write_file(fd,data,i) != i) goto report_write_error; -@@ -251,6 +258,8 @@ static int receive_data(int f_in, char * +@@ -279,6 +286,8 @@ static int receive_data(int f_in, char * see_token(map, len); sum_update(map, len); @@ -487,7 +487,7 @@ the file's name. } if (inplace) { -@@ -291,6 +300,8 @@ static int receive_data(int f_in, char * +@@ -319,6 +328,8 @@ static int receive_data(int f_in, char * } sum_end(file_sum1); @@ -496,7 +496,7 @@ the file's name. if (mapbuf) unmap_file(mapbuf); -@@ -306,7 +317,7 @@ static int receive_data(int f_in, char * +@@ -334,7 +345,7 @@ static int receive_data(int f_in, char * static void discard_receive_data(int f_in, OFF_T length) { @@ -505,13 +505,13 @@ the file's name. } static void handle_delayed_updates(struct file_list *flist, char *local_name) -@@ -628,8 +639,12 @@ int recv_files(int f_in, struct file_lis +@@ -663,8 +674,12 @@ int recv_files(int f_in, struct file_lis rprintf(FINFO, "%s\n", safe_fname(fname)); /* recv file data */ +#if HAVE_LINK + if (link_by_hash_dir) -+ file->u.sum = (char*)malloc(MD4_SUM_LENGTH); ++ file->u.sum = new_array(char, MD4_SUM_LENGTH); +#endif recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size, - fname, fd2, file->length); @@ -519,7 +519,7 @@ the file's name. if (!log_before_transfer) log_item(file, &initial_stats, iflags, NULL); ---- orig/rsync.c 2005-03-16 02:19:30 +--- orig/rsync.c 2005-07-27 23:31:12 +++ rsync.c 2005-02-21 11:04:36 @@ -38,6 +38,7 @@ extern int inplace; extern int keep_dirlinks; @@ -529,7 +529,7 @@ the file's name. /* -@@ -188,7 +189,12 @@ void finish_transfer(char *fname, char * +@@ -190,7 +191,12 @@ void finish_transfer(char *fname, char * rprintf(FINFO, "renaming %s to %s\n", safe_fname(fnametmp), safe_fname(fname)); } @@ -543,9 +543,9 @@ the file's name. if (ret < 0) { rsyserr(FERROR, errno, "%s %s -> \"%s\"", ret == -2 ? "copy" : "rename", ---- orig/rsync.h 2005-03-28 20:56:55 +--- orig/rsync.h 2005-08-17 06:45:08 +++ rsync.h 2004-07-03 20:20:15 -@@ -632,6 +632,14 @@ struct stats { +@@ -639,6 +639,14 @@ struct stats { int current_file_index; }; @@ -560,9 +560,9 @@ the file's name. #include "byteorder.h" #include "lib/mdfour.h" ---- orig/rsync.yo 2005-03-30 16:57:29 +--- orig/rsync.yo 2005-08-27 21:05:12 +++ rsync.yo 2005-02-13 06:58:47 -@@ -355,6 +355,7 @@ to the detailed description below for a +@@ -356,6 +356,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