X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/0808daa5ca0ad76d46c74eaad2c46c023704cdc8..ff55cce0a8b6abecf86ffd55a2eb3bf97a79dd7e:/link-by-hash.diff diff --git a/link-by-hash.diff b/link-by-hash.diff index 8ec19f7..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-03 11:56:03 +--- 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 @@ -49,7 +49,7 @@ the file's name. + +extern char *link_by_hash_dir; + -+#ifdef HAVE_LINK ++#if HAVE_LINK + +char* make_hash_name(struct file_struct *file) +{ @@ -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,42 +365,42 @@ the file's name. +} + +#endif ---- orig/options.c 2004-11-27 17:53:24 -+++ options.c 2004-11-27 18:19:42 -@@ -128,6 +128,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; +char *link_by_hash_dir = NULL; char backup_dir_buf[MAXPATHLEN]; - int rsync_port = RSYNC_PORT; - int copy_dest = 0; -@@ -288,6 +289,7 @@ void usage(enum logcode F) + int rsync_port = 0; + int compare_dest = 0; +@@ -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"); -+ rprintf(F," --link-by-hash=DIR create hardlinks by hash to DIR for regular files\n"); - rprintf(F," -P equivalent to --partial --progress\n"); - rprintf(F," -z, --compress compress file data\n"); - rprintf(F," -C, --cvs-exclude auto ignore files in the same way CVS does\n"); -@@ -322,7 +324,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP - OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED, - 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, ++ 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," -C, --cvs-exclude auto-ignore files the same way CVS does\n"); + rprintf(F," -f, --filter=RULE add a file-filtering RULE\n"); +@@ -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_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[] = { -@@ -383,6 +385,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}, - /* TODO: Should this take an optional int giving the compression level? */ + {"fuzzy", 'y', POPT_ARG_NONE, &fuzzy_basis, 0, 0, 0 }, {"compress", 'z', POPT_ARG_NONE, &do_compression, 0, 0, 0 }, - {"stats", 0, POPT_ARG_NONE, &do_stats, 0, 0, 0 }, -@@ -749,6 +752,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; @@ -421,8 +421,8 @@ the file's name. + default: /* A large opt value means that set_refuse_options() - * turned this option off (opt-BASE is its index). */ -@@ -1225,6 +1243,11 @@ void server_options(char **args,int *arg + * turned this option off. */ +@@ -1507,6 +1525,11 @@ void server_options(char **args,int *arg } } @@ -431,20 +431,20 @@ the file's name. + args[ac++] = link_by_hash_dir; + } + - if (files_from && (!am_sender || remote_filesfrom_file)) { - if (remote_filesfrom_file) { + if (files_from && (!am_sender || filesfrom_host)) { + if (filesfrom_host) { args[ac++] = "--files-from"; ---- orig/receiver.c 2004-11-27 17:57:31 -+++ receiver.c 2004-11-27 18:20:00 -@@ -40,6 +40,7 @@ extern int io_error; +--- orig/receiver.c 2005-08-17 06:45:08 ++++ receiver.c 2005-01-15 21:29:13 +@@ -53,6 +53,7 @@ extern int delay_updates; + extern struct stats stats; + extern char *log_format; extern char *tmpdir; ++extern char *link_by_hash_dir; extern char *partial_dir; extern char *basis_dir[]; -+extern char *link_by_hash_dir; - extern int make_backups; - extern int do_progress; - extern char *backup_dir; -@@ -203,12 +204,13 @@ static int get_tmpname(char *fnametmp, c + extern struct file_list *the_file_list; +@@ -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, @@ -456,10 +456,10 @@ the file's name. struct map_struct *mapbuf; struct sum_struct sum; + struct mdfour mdfour_data; - unsigned int len; + int32 len; OFF_T offset = 0; OFF_T offset2; -@@ -228,6 +230,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,26 +468,26 @@ the file's name. + sum_init(checksum_seed); - while ((i = recv_token(f_in, &data)) != 0) { -@@ -244,6 +249,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); + sum_update(data, i); + if (md4) + mdfour_update(&mdfour_data,data,i); if (fd != -1 && write_file(fd,data,i) != i) goto report_write_error; -@@ -268,6 +275,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); + sum_update(map, len); + if (md4) + mdfour_update(&mdfour_data,map,len); } if (inplace) { -@@ -307,6 +316,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); -@@ -322,7 +333,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) { @@ -504,37 +504,37 @@ the file's name. + receive_data(f_in, NULL, -1, 0, NULL, -1, length, NULL); } - -@@ -550,8 +561,12 @@ int recv_files(int f_in, struct file_lis + static void handle_delayed_updates(struct file_list *flist, char *local_name) +@@ -663,8 +674,12 @@ int recv_files(int f_in, struct file_lis rprintf(FINFO, "%s\n", safe_fname(fname)); /* recv file data */ -+#ifdef HAVE_LINK ++#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); + fname, fd2, file->length, file->u.sum); - log_recv(file, &initial_stats); - ---- orig/rsync.c 2004-09-07 21:45:30 -+++ rsync.c 2004-08-13 18:14:34 -@@ -34,6 +34,7 @@ extern int force_delete; - extern int recurse; + if (!log_before_transfer) + log_item(file, &initial_stats, iflags, NULL); +--- 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; extern int make_backups; + extern struct stats stats; +extern char *link_by_hash_dir; - extern char *backup_dir; - extern int inplace; -@@ -254,7 +255,12 @@ void finish_transfer(char *fname, char * - /* move tmp file over real file */ - if (verbose > 2) - rprintf(FINFO, "renaming %s to %s\n", fnametmp, fname); + + /* +@@ -190,7 +191,12 @@ void finish_transfer(char *fname, char * + rprintf(FINFO, "renaming %s to %s\n", + safe_fname(fnametmp), safe_fname(fname)); + } - ret = robust_rename(fnametmp, fname, file->mode & INITACCESSPERMS); -+#ifdef HAVE_LINK ++#if HAVE_LINK + if (link_by_hash_dir) + ret = link_by_hash(fnametmp, fname, file); + else @@ -543,9 +543,9 @@ the file's name. if (ret < 0) { rsyserr(FERROR, errno, "%s %s -> \"%s\"", ret == -2 ? "copy" : "rename", ---- orig/rsync.h 2004-11-27 17:53:24 +--- orig/rsync.h 2005-08-17 06:45:08 +++ rsync.h 2004-07-03 20:20:15 -@@ -536,6 +536,14 @@ struct stats { +@@ -639,6 +639,14 @@ struct stats { int current_file_index; }; @@ -558,5 +558,15 @@ the file's name. +}; + - /* we need this function because of the silly way in which duplicate - entries are handled in the file lists - we can't change this + #include "byteorder.h" + #include "lib/mdfour.h" +--- orig/rsync.yo 2005-08-27 21:05:12 ++++ rsync.yo 2005-02-13 06:58:47 +@@ -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 ++ --link-by-hash=DIR create hardlinks by hash into DIR + -z, --compress compress file data during the transfer + -C, --cvs-exclude auto-ignore files in the same way CVS does + -f, --filter=RULE add a file-filtering RULE