X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/79f132a15fbace5ee4f352248973ff53a2326961..81a5d4ab71cd51f98e160a9e5a402adc591488db:/link-by-hash.diff diff --git a/link-by-hash.diff b/link-by-hash.diff index d8bd437..eb6cf59 100644 --- a/link-by-hash.diff +++ b/link-by-hash.diff @@ -365,9 +365,9 @@ the file's name. +} + +#endif ---- orig/options.c 2005-01-28 19:08:20 -+++ options.c 2005-01-28 19:32:26 -@@ -132,6 +132,7 @@ char *log_format = NULL; +--- orig/options.c 2005-03-01 05:49:24 ++++ options.c 2005-03-01 01:27:55 +@@ -140,6 +140,7 @@ char *log_format = NULL; char *password_file = NULL; char *rsync_path = RSYNC_PATH; char *backup_dir = NULL; @@ -375,32 +375,32 @@ the file's name. char backup_dir_buf[MAXPATHLEN]; int rsync_port = 0; int compare_dest = 0; -@@ -303,6 +304,7 @@ void usage(enum logcode F) +@@ -318,6 +319,7 @@ void usage(enum logcode F) + rprintf(F," -y, --fuzzy find similar file for basis if no dest file\n"); 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," -z, --compress compress file data\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," -C, --cvs-exclude auto-ignore files the same way CVS does\n"); rprintf(F," -f, --filter=RULE add a file-filtering RULE\n"); -@@ -341,7 +343,7 @@ void usage(enum logcode F) +@@ -357,7 +359,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_FILTER, OPT_COMPARE_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_REFUSED_BASE = 9000}; static struct poptOption long_options[] = { -@@ -408,6 +410,7 @@ static struct poptOption long_options[] +@@ -425,6 +427,7 @@ static struct poptOption long_options[] + {"temp-dir", 'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 }, {"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 }, - {"stats", 0, POPT_ARG_NONE, &do_stats, 0, 0, 0 }, -@@ -802,6 +805,21 @@ int parse_arguments(int *argc, const cha +@@ -854,6 +857,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). */ -@@ -1299,6 +1317,11 @@ void server_options(char **args,int *arg + * turned this option off. */ +@@ -1435,6 +1453,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 2005-01-28 19:08:20 +--- orig/receiver.c 2005-02-26 19:27:54 +++ receiver.c 2005-01-15 21:29:13 -@@ -36,6 +36,7 @@ extern int preserve_hard_links; - extern int preserve_perms; - extern int io_error; +@@ -51,6 +51,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 int basis_dir_cnt; -@@ -132,12 +133,13 @@ static int get_tmpname(char *fnametmp, c + +@@ -183,12 +184,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; -@@ -157,6 +159,9 @@ static int receive_data(int f_in, char * +@@ -208,6 +210,9 @@ static int receive_data(int f_in, char * } else mapbuf = NULL; @@ -469,7 +469,7 @@ the file's name. sum_init(checksum_seed); while ((i = recv_token(f_in, &data)) != 0) { -@@ -173,6 +178,8 @@ static int receive_data(int f_in, char * +@@ -224,6 +229,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; -@@ -199,6 +206,8 @@ static int receive_data(int f_in, char * +@@ -250,6 +257,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) { -@@ -239,6 +248,8 @@ static int receive_data(int f_in, char * +@@ -290,6 +299,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); -@@ -254,7 +265,7 @@ static int receive_data(int f_in, char * +@@ -335,7 +346,7 @@ static void read_gen_name(int fd, char * static void discard_receive_data(int f_in, OFF_T length) { @@ -505,7 +505,7 @@ the file's name. } -@@ -495,8 +506,12 @@ int recv_files(int f_in, struct file_lis +@@ -602,8 +613,12 @@ int recv_files(int f_in, struct file_lis rprintf(FINFO, "%s\n", safe_fname(fname)); /* recv file data */ @@ -517,22 +517,22 @@ the file's name. - fname, fd2, file->length); + fname, fd2, file->length, file->u.sum); - log_recv(file, &initial_stats); - ---- orig/rsync.c 2005-01-28 19:08:20 -+++ rsync.c 2004-08-13 18:14:34 -@@ -35,6 +35,7 @@ extern int force_delete; - extern int recurse; + if (!log_before_transfer) + log_recv(file, &initial_stats, iflags); +--- orig/rsync.c 2005-02-25 18:44:31 ++++ rsync.c 2005-02-21 11:04:36 +@@ -39,6 +39,7 @@ extern int recurse; 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; -@@ -281,7 +282,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); + + /* +@@ -189,7 +190,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); +#if HAVE_LINK + if (link_by_hash_dir) @@ -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-01-28 19:08:20 +--- orig/rsync.h 2005-02-23 02:57:27 +++ rsync.h 2004-07-03 20:20:15 -@@ -599,6 +599,14 @@ struct stats { +@@ -621,6 +621,14 @@ struct stats { int current_file_index; }; @@ -558,15 +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 ---- orig/rsync.yo 2005-01-28 17:12:14 -+++ rsync.yo 2005-01-28 19:32:45 -@@ -365,6 +365,7 @@ verb( + #include "byteorder.h" + #include "lib/mdfour.h" +--- orig/rsync.yo 2005-03-01 01:22:59 ++++ rsync.yo 2005-02-13 06:58:47 +@@ -355,6 +355,7 @@ to the detailed description below for a + -y, --fuzzy find similar file for basis if no dest file --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 to DIR for regular files - -z, --compress compress file data ++ --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