X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/2eb075b256978aa6e1fc838a749476d5839a3f5c..efd0f7d14cffebffe0e9a1a689a284c0516bc331:/link-by-hash.diff diff --git a/link-by-hash.diff b/link-by-hash.diff index 6ccebc6..ccc0a0e 100644 --- a/link-by-hash.diff +++ b/link-by-hash.diff @@ -1,44 +1,30 @@ -To: rsync@lists.samba.org -From: "Jason M. Felice" -Subject: [patch] Add `--link-by-hash' option (rev 5). -Date: Mon, 23 Feb 2004 13:29:08 -0500 +After applying this patch and running configure, you MUST run this +command before "make": + + make proto + +Jason M. Felice writes: This patch adds the --link-by-hash=DIR option, which hard links received files in a link farm arranged by MD4 file hash. The result is that the system will only store one copy of the unique contents of each file, regardless of the file's name. -(rev 5) -* Fixed silly logic error. - -(rev 4) -* Updated for committed robust_rename() patch, other changes in CVS. - -(rev 3) -* Don't link empty files. -* Roll over to new file when filesystem maximum link count is reached. -* If link fails for another reason, leave non-linked file there. -* Depends on rsync-rename.diff - -(rev 2) -* This revision is actually against CVS HEAD (I didn't realize I was working - from a stale rsync'd CVS). -* Apply permissions after linking (permissions were lost if we already had - a copy of the file in the link farm). - -Patch Summary: - -1 +1 Makefile.in - -0 +351 hashlink.c (new) - -1 +22 options.c - -0 +6 proto.h - -6 +21 receiver.c - -2 +8 rsync.c - -0 +8 rsync.h - ---- hashlink.c 1969-12-31 19:00:00.000000000 -0500 -+++ hashlink.c 2004-02-23 10:30:45.000000000 -0500 -@@ -0,0 +1,351 @@ +--- orig/Makefile.in 2004-11-03 11:56:03 ++++ Makefile.in 2004-07-03 20:20:15 +@@ -35,7 +35,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 +-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 + popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \ + popt/popthelp.o popt/poptparse.o +--- orig/hashlink.c 2004-09-24 16:44:25 ++++ hashlink.c 2004-09-24 16:44:25 +@@ -0,0 +1,340 @@ +/* + Copyright (C) Cronosys, LLC 2004 + @@ -63,7 +49,7 @@ Patch Summary: + +extern char *link_by_hash_dir; + -+#ifdef HAVE_LINK ++#if HAVE_LINK + +char* make_hash_name(struct file_struct *file) +{ @@ -125,12 +111,11 @@ Patch Summary: + long this_fnbr; + + *fnbr = 0; -+ ++ + /* Build a list of potential candidates and open + * them. */ + if ((d = opendir(hashname)) == NULL) { -+ rprintf(FERROR,"opendir \"%s\": %s\n", -+ hashname, strerror(errno)); ++ rsyserr(FERROR, errno, "opendir failed: \"%s\"", hashname); + free(hashname); + return NULL; + } @@ -149,8 +134,7 @@ Patch Summary: + asprintf(&hashfile->name,"%s/%s",hashname, + di->d_name); + if (do_stat(hashfile->name,&st) == -1) { -+ rprintf(FERROR,"%s: %s", hashfile->name, -+ strerror(errno)); ++ rsyserr(FERROR, errno, "stat failed: %s", hashfile->name); + kill_hashfile(hashfile); + continue; + } @@ -161,8 +145,7 @@ Patch Summary: + hashfile->nlink = st.st_nlink; + hashfile->fd = open(hashfile->name,O_RDONLY|O_BINARY); + if (hashfile->fd == -1) { -+ rprintf(FERROR,"%s: %s\n", hashfile->name, -+ strerror(errno)); ++ rsyserr(FERROR, errno, "open failed: %s", hashfile->name); + kill_hashfile(hashfile); + continue; + } @@ -227,11 +210,10 @@ Patch Summary: + /* There are no matches. */ + return NULL; + } -+ + } + + if (amt == -1) { -+ rprintf(FERROR,"%s",strerror(errno)); ++ rsyserr(FERROR, errno, "read failed in compare_hashfiles()"); + kill_hashfiles(files); + return NULL; + } @@ -267,7 +249,7 @@ Patch Summary: +int link_by_hash(char *fnametmp,char *fname,struct file_struct *file) +{ + STRUCT_STAT st; -+ char *hashname = make_hash_name(file); ++ char *hashname = make_hash_name(file); + int first = 0, rc; + char *linkname; + long last_fnbr; @@ -283,8 +265,7 @@ Patch Summary: + dirname = strdup(hashname); + *strrchr(dirname,'/') = 0; + if (do_mkdir(dirname, 0755) == -1 && errno != EEXIST) { -+ rprintf(FERROR, "mkdir %s: %s\n", dirname, -+ strerror(errno)); ++ rsyserr(FERROR, errno, "mkdir failed: %s", dirname); + free(hashname); + free(dirname); + return robust_rename(fnametmp,fname,0644); @@ -292,8 +273,7 @@ Patch Summary: + free(dirname); + + if (do_mkdir(hashname, 0755) == -1 && errno != EEXIST) { -+ rprintf(FERROR, "mkdir %s: %s\n", hashname, -+ strerror(errno)); ++ rsyserr(FERROR, errno, "mkdir failed: %s", hashname); + free(hashname); + return robust_rename(fnametmp,fname,0644); + } @@ -301,13 +281,11 @@ Patch Summary: + first = 1; + asprintf(&linkname,"%s/0",hashname); + rprintf(FINFO, "(1) linkname = %s\n", linkname); -+ + } else { + struct hashfile_struct *hashfiles, *hashfile; -+ int fd; + + if (do_stat(fnametmp,&st) == -1) { -+ rprintf(FERROR,"%s: %s\n",fname,strerror(errno)); ++ rsyserr(FERROR, errno, "stat failed: %s", fname); + return -1; + } + hashfiles = find_hashfiles(hashname, st.st_size, &last_fnbr); @@ -317,16 +295,16 @@ Patch Summary: + asprintf(&linkname,"%s/0",hashname); + rprintf(FINFO, "(2) linkname = %s\n", linkname); + } else { -+ ++ int fd; + /* Search for one identical to us. */ + if ((fd = open(fnametmp,O_RDONLY|O_BINARY)) == -1) { -+ rprintf(FERROR,"%s: %s\n",fnametmp, -+ strerror(errno)); ++ rsyserr(FERROR, errno, "open failed: %s", fnametmp); + kill_hashfiles(hashfiles); + return -1; + } + hashfile = compare_hashfiles(fd, hashfiles); + hashfiles = NULL; ++ close(fd); + + if (hashfile) { + first = 0; @@ -345,6 +323,7 @@ Patch Summary: + if (!first) { + rprintf(FINFO, "link-by-hash (existing): \"%s\" -> %s\n", + linkname, full_fname(fname)); ++ robust_unlink(fname); + rc = do_link(linkname, fname); + if (rc == -1) { + if (errno == EMLINK) { @@ -355,10 +334,8 @@ Patch Summary: + rprintf(FINFO, "(5) linkname = %s\n", linkname); + rprintf(FINFO,"link-by-hash: max link count exceeded, starting new file \"%s\".\n", linkname); + } else { -+ rprintf(FERROR,"link \"%s\" -> %s: %s\n", -+ linkname,full_fname(fname), -+ strerror(errno)); -+ robust_unlink(fname); ++ rsyserr(FERROR, errno, "link \"%s\" -> \"%s\"", ++ linkname, full_fname(fname)); + rc = robust_rename(fnametmp,fname,0644); + } + } else { @@ -372,15 +349,13 @@ Patch Summary: + + rc = robust_rename(fnametmp,fname,0644); + if (rc != 0) { -+ rprintf(FERROR,"rename \"%s\" -> \"%s\": %s\n", -+ full_fname(fnametmp),full_fname(fname), -+ strerror(errno)); ++ rsyserr(FERROR, errno, "rename \"%s\" -> \"%s\"", ++ full_fname(fnametmp), full_fname(fname)); + } + rc = do_link(fname,linkname); + if (rc != 0) { -+ rprintf(FERROR,"link \"%s\" -> \"%s\": %s\n", -+ full_fname(fname),linkname, -+ strerror(errno)); ++ rsyserr(FERROR, errno, "link \"%s\" -> \"%s\"", ++ full_fname(fname), linkname); + } + } + @@ -390,60 +365,51 @@ Patch Summary: +} + +#endif ---- Makefile.in 2004-02-23 10:22:51.000000000 -0500 -+++ Makefile.in 2004-02-23 10:22:51.000000000 -0500 -@@ -35,7 +35,7 @@ - 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 --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 - popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \ - popt/popthelp.o popt/poptparse.o ---- options.c 2004-02-23 10:22:51.000000000 -0500 -+++ options.c 2004-02-23 10:29:14.000000000 -0500 -@@ -119,6 +119,7 @@ +--- orig/options.c 2005-02-16 15:35:53 ++++ options.c 2005-02-14 02:52:09 +@@ -132,6 +132,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 link_dest = 0; -@@ -264,6 +265,7 @@ - rprintf(F," -T --temp-dir=DIR create temporary files in directory DIR\n"); + int rsync_port = 0; + int compare_dest = 0; +@@ -309,6 +310,7 @@ void usage(enum logcode F) rprintf(F," --compare-dest=DIR also compare destination files relative to DIR\n"); - rprintf(F," --link-dest=DIR create hardlinks to DIR for unchanged files\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"); -@@ -303,7 +305,7 @@ - enum {OPT_VERSION = 1000, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM, - OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED, OPT_LINK_DEST, + 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," -C, --cvs-exclude auto-ignore files the same way CVS does\n"); + rprintf(F," -f, --filter=RULE add a file-filtering RULE\n"); +@@ -348,7 +350,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_READ_BATCH, OPT_WRITE_BATCH, OPT_LINK_BY_HASH, +- 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[] = { -@@ -360,6 +362,7 @@ - {"temp-dir", 'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 }, - {"compare-dest", 0, POPT_ARG_STRING, &compare_dest, 0, 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}, +@@ -416,6 +418,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 }, - {"daemon", 0, POPT_ARG_NONE, &daemon_opt, 0, 0, 0 }, -@@ -577,6 +580,19 @@ - return 0; - #endif +@@ -840,6 +843,21 @@ int parse_arguments(int *argc, const cha + basis_dir[basis_dir_cnt++] = (char *)arg; + break; + case OPT_LINK_BY_HASH: +#if HAVE_LINK -+ link_by_hash_dir = (char *)poptGetOptArg(pc); -+ checksum_seed = FIXED_CHECKSUM_SEED; ++ arg = poptGetOptArg(pc); ++ if (sanitize_paths) ++ arg = sanitize_path(NULL, arg, NULL, 0); ++ link_by_hash_dir = (char *)arg; + break; +#else + snprintf(err_buf, sizeof err_buf, @@ -455,9 +421,9 @@ Patch Summary: + default: /* A large opt value means that set_refuse_options() - * turned this option off (opt-BASE is its index). */ -@@ -934,6 +950,11 @@ - args[ac++] = compare_dest; + * turned this option off. */ +@@ -1392,6 +1410,11 @@ void server_options(char **args,int *arg + } } + if (link_by_hash_dir && am_sender) { @@ -468,152 +434,118 @@ Patch Summary: if (files_from && (!am_sender || remote_filesfrom_file)) { if (remote_filesfrom_file) { args[ac++] = "--files-from"; ---- proto.h 2004-02-23 10:22:51.000000000 -0500 -+++ proto.h 2004-02-23 11:06:03.000000000 -0500 -@@ -93,6 +93,12 @@ - void write_sum_head(int f, struct sum_struct *sum); - void recv_generator(char *fname, struct file_struct *file, int i, int f_out); - void generate_files(int f, struct file_list *flist, char *local_name); -+char* make_hash_name(struct file_struct *file); -+void kill_hashfile(struct hashfile_struct *hashfile); -+void kill_hashfiles(struct hashfile_struct *hashfiles); -+struct hashfile_struct *find_hashfiles(char *hashname, int64 size, long *fnbr); -+struct hashfile_struct *compare_hashfiles(int fd,struct hashfile_struct *files); -+int link_by_hash(char *fnametmp,char *fname,struct file_struct *file); - void init_hard_links(struct file_list *flist); - int hard_link_check(struct file_struct *file, int skip); - void do_hard_links(void); ---- receiver.c 2004-02-23 10:22:51.000000000 -0500 -+++ receiver.c 2004-02-23 10:22:51.000000000 -0500 -@@ -186,10 +186,11 @@ +--- orig/receiver.c 2005-02-16 15:35:53 ++++ receiver.c 2005-01-15 21:29:13 +@@ -37,6 +37,7 @@ extern int preserve_hard_links; + extern int preserve_perms; + extern int io_error; + extern char *tmpdir; ++extern char *link_by_hash_dir; + extern char *partial_dir; + extern char *basis_dir[]; + extern int basis_dir_cnt; +@@ -140,12 +141,13 @@ static int get_tmpname(char *fnametmp, c - static int receive_data(int f_in,struct map_struct *mapbuf,int fd,char *fname, -- OFF_T total_size) -+ OFF_T total_size,char *md4) + static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r, +- char *fname, int fd, OFF_T total_size) ++ char *fname, int fd, OFF_T total_size, char *md4) { - int i; + static char file_sum1[MD4_SUM_LENGTH]; + static char file_sum2[MD4_SUM_LENGTH]; + struct map_struct *mapbuf; struct sum_struct sum; + struct mdfour mdfour_data; - unsigned int len; + int32 len; OFF_T offset = 0; OFF_T offset2; -@@ -199,7 +200,9 @@ - char *map=NULL; +@@ -165,6 +167,9 @@ static int receive_data(int f_in, char * + } else + mapbuf = NULL; - read_sum_head(f_in, &sum); -- + if (md4) + mdfour_begin(&mdfour_data); -+ - sum_init(); ++ + sum_init(checksum_seed); while ((i = recv_token(f_in, &data)) != 0) { -@@ -216,6 +219,8 @@ +@@ -181,6 +186,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) { - rprintf(FERROR, "write failed on %s: %s\n", -@@ -243,6 +248,8 @@ + if (fd != -1 && write_file(fd,data,i) != i) + goto report_write_error; +@@ -207,6 +214,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 (fd != -1 && write_file(fd,map,len) != (int) len) { -@@ -265,6 +272,8 @@ + if (inplace) { +@@ -247,6 +256,8 @@ static int receive_data(int f_in, char * } sum_end(file_sum1); + if (md4) + mdfour_result(&mdfour_data, (unsigned char*)md4); - read_buf(f_in,file_sum2,MD4_SUM_LENGTH); - if (verbose > 2) { -@@ -299,6 +308,7 @@ - extern int preserve_perms; - extern int delete_after; - extern int orig_umask; -+ extern char *link_by_hash_dir; - struct stats initial_stats; + if (mapbuf) + unmap_file(mapbuf); +@@ -292,7 +303,7 @@ static void read_gen_name(int fd, char * - if (verbose > 2) { -@@ -372,7 +382,7 @@ - if (fd1 != -1 && do_fstat(fd1,&st) != 0) { - rprintf(FERROR, "fstat %s failed: %s\n", - full_fname(fnamecmp), strerror(errno)); -- receive_data(f_in,NULL,-1,NULL,file->length); -+ receive_data(f_in,NULL,-1,NULL,file->length,NULL); - close(fd1); - continue; - } -@@ -385,7 +395,7 @@ - */ - rprintf(FERROR,"recv_files: %s is a directory\n", - full_fname(fnamecmp)); -- receive_data(f_in, NULL, -1, NULL, file->length); -+ receive_data(f_in,NULL,-1,NULL,file->length,NULL); - close(fd1); - continue; - } -@@ -437,7 +447,7 @@ - if (fd2 == -1) { - rprintf(FERROR, "mkstemp %s failed: %s\n", - full_fname(fnametmp), strerror(errno)); -- receive_data(f_in,mapbuf,-1,NULL,file->length); -+ receive_data(f_in,mapbuf,-1,NULL,file->length,NULL); - if (mapbuf) unmap_file(mapbuf); - if (fd1 != -1) close(fd1); - continue; -@@ -450,7 +460,12 @@ - } + static void discard_receive_data(int f_in, OFF_T length) + { +- receive_data(f_in, NULL, -1, 0, NULL, -1, length); ++ receive_data(f_in, NULL, -1, 0, NULL, -1, length, NULL); + } + + +@@ -555,8 +566,12 @@ int recv_files(int f_in, struct file_lis + rprintf(FINFO, "%s\n", safe_fname(fname)); /* recv file data */ -- recv_ok = receive_data(f_in,mapbuf,fd2,fname,file->length); -+#ifdef HAVE_LINK -+ if (link_by_hash_dir) { -+ file->u.sum = (char*)malloc (MD4_SUM_LENGTH); -+ } ++#if HAVE_LINK ++ if (link_by_hash_dir) ++ file->u.sum = (char*)malloc(MD4_SUM_LENGTH); +#endif -+ recv_ok = receive_data(f_in,mapbuf,fd2,fname,file->length,file->u.sum); - - log_recv(file, &initial_stats); + recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size, +- fname, fd2, file->length); ++ fname, fd2, file->length, file->u.sum); ---- rsync.c 2004-02-23 10:22:51.000000000 -0500 -+++ rsync.c 2004-02-23 12:49:33.000000000 -0500 -@@ -33,6 +33,7 @@ - extern int preserve_gid; - extern int preserve_perms; + if (!log_before_transfer) + log_recv(file, &initial_stats, iflags); +--- orig/rsync.c 2005-02-14 02:45:10 ++++ rsync.c 2005-02-07 21:11:30 +@@ -36,6 +36,7 @@ extern int force_delete; + extern int recurse; + extern int keep_dirlinks; extern int make_backups; +extern char *link_by_hash_dir; + extern char *backup_dir; + extern int inplace; - - /* -@@ -236,8 +237,13 @@ - if (make_backups && !make_backup(fname)) - return; - -- /* move tmp file over real file */ +@@ -287,7 +288,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); ++ ret = link_by_hash(fnametmp, fname, file); + else +#endif + ret = robust_rename(fnametmp, fname, file->mode & INITACCESSPERMS); -+ - if (ret != 0) { - rprintf(FERROR, "%s %s -> \"%s\": %s\n", + if (ret < 0) { + rsyserr(FERROR, errno, "%s %s -> \"%s\"", ret == -2 ? "copy" : "rename", ---- rsync.h 2004-02-23 10:22:51.000000000 -0500 -+++ rsync.h 2004-02-23 12:42:59.000000000 -0500 -@@ -513,6 +513,14 @@ +--- orig/rsync.h 2005-02-16 15:35:54 ++++ rsync.h 2004-07-03 20:20:15 +@@ -618,6 +618,14 @@ struct stats { int current_file_index; }; @@ -626,5 +558,15 @@ Patch Summary: +}; + - /* 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-02-16 15:35:54 ++++ rsync.yo 2005-02-13 06:58:47 +@@ -355,6 +355,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