X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/7b675ff5734df9400fa7be8f65daac400bf71efd..d5753a220d76c6fa93b24845c6569e8bf29fd883:/link-by-hash.diff diff --git a/link-by-hash.diff b/link-by-hash.diff index 19bf5c7..f0ba55d 100644 --- a/link-by-hash.diff +++ b/link-by-hash.diff @@ -11,8 +11,8 @@ will only store one copy of the unique contents of each file, regardless of the file's name. ---- Makefile.in 15 May 2004 00:48:11 -0000 1.101 -+++ Makefile.in 21 May 2004 09:07:58 -0000 +--- orig/Makefile.in 2004-07-04 08:59:17 ++++ 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 \ @@ -22,8 +22,8 @@ the file's name. 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 ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ hashlink.c 21 May 2004 09:07:59 -0000 +--- orig/hashlink.c 2004-07-02 21:41:54 ++++ hashlink.c 2004-07-02 21:41:54 @@ -0,0 +1,342 @@ +/* + Copyright (C) Cronosys, LLC 2004 @@ -367,9 +367,9 @@ the file's name. +} + +#endif ---- options.c 6 May 2004 21:08:01 -0000 1.148 -+++ options.c 21 May 2004 09:07:59 -0000 -@@ -121,6 +121,7 @@ char *log_format = NULL; +--- orig/options.c 2004-08-03 15:41:32 ++++ options.c 2004-07-03 20:20:15 +@@ -127,6 +127,7 @@ char *log_format = NULL; char *password_file = NULL; char *rsync_path = RSYNC_PATH; char *backup_dir = NULL; @@ -377,24 +377,24 @@ the file's name. char backup_dir_buf[MAXPATHLEN]; int rsync_port = RSYNC_PORT; int link_dest = 0; -@@ -266,6 +267,7 @@ void usage(enum logcode F) - rprintf(F," -T --temp-dir=DIR create temporary files in directory DIR\n"); +@@ -280,6 +281,7 @@ void usage(enum logcode F) + rprintf(F," -T, --temp-dir=DIR create temporary files in directory DIR\n"); 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"); -@@ -305,7 +307,7 @@ void usage(enum logcode F) +@@ -320,7 +322,7 @@ void usage(enum logcode F) enum {OPT_VERSION = 1000, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM, OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED, 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_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT, OPT_LINK_BY_HASH, OPT_REFUSED_BASE = 9000}; static struct poptOption long_options[] = { -@@ -362,6 +364,7 @@ static struct poptOption long_options[] +@@ -379,6 +381,7 @@ static struct poptOption long_options[] {"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, &compare_dest, OPT_LINK_DEST, 0, 0 }, @@ -402,7 +402,7 @@ the file's name. /* 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 }, -@@ -584,6 +587,19 @@ int parse_arguments(int *argc, const cha +@@ -618,6 +621,19 @@ int parse_arguments(int *argc, const cha return 0; #endif @@ -422,7 +422,7 @@ the file's name. default: /* A large opt value means that set_refuse_options() * turned this option off (opt-BASE is its index). */ -@@ -953,6 +969,11 @@ void server_options(char **args,int *arg +@@ -1076,6 +1092,11 @@ void server_options(char **args,int *arg args[ac++] = compare_dest; } @@ -434,32 +434,34 @@ the file's name. if (files_from && (!am_sender || remote_filesfrom_file)) { if (remote_filesfrom_file) { args[ac++] = "--files-from"; ---- receiver.c 21 May 2004 08:27:04 -0000 1.79 -+++ receiver.c 21 May 2004 09:07:59 -0000 -@@ -47,6 +47,7 @@ extern int ignore_errors; - extern int orig_umask; - extern int keep_partial; - extern int checksum_seed; +--- orig/receiver.c 2004-08-03 15:34:32 ++++ receiver.c 2004-07-20 21:44:05 +@@ -39,6 +39,7 @@ extern int io_error; + extern char *tmpdir; + extern char *partial_dir; + extern char *compare_dest; +extern char *link_by_hash_dir; - - static void delete_one(char *fn, int is_dir) - { -@@ -193,10 +194,11 @@ static int get_tmpname(char *fnametmp, c + extern int make_backups; + extern int do_progress; + extern char *backup_dir; +@@ -206,12 +207,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; OFF_T offset = 0; OFF_T offset2; -@@ -207,6 +209,9 @@ static int receive_data(int f_in,struct - - read_sum_head(f_in, &sum); +@@ -231,6 +233,9 @@ static int receive_data(int f_in, char * + } else + mapbuf = NULL; + if (md4) + mdfour_begin(&mdfour_data); @@ -467,16 +469,16 @@ the file's name. sum_init(checksum_seed); while ((i = recv_token(f_in, &data)) != 0) { -@@ -223,6 +228,8 @@ static int receive_data(int f_in,struct +@@ -247,6 +252,8 @@ static int receive_data(int f_in, char * cleanup_got_literal = 1; sum_update(data,i); + if (md4) + mdfour_update(&mdfour_data,data,i); - if (fd != -1 && write_file(fd,data,i) != i) { - rsyserr(FERROR, errno, "write failed on %s", -@@ -250,6 +257,8 @@ static int receive_data(int f_in,struct + if (fd != -1 && write_file(fd,data,i) != i) + goto report_write_error; +@@ -271,6 +278,8 @@ static int receive_data(int f_in, char * see_token(map, len); sum_update(map,len); @@ -484,84 +486,65 @@ the file's name. + mdfour_update(&mdfour_data,map,len); } - if (fd != -1 && write_file(fd,map,len) != (int) len) { -@@ -272,6 +281,8 @@ static int receive_data(int f_in,struct + if (inplace) { +@@ -310,6 +319,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) { -@@ -375,7 +386,7 @@ int recv_files(int f_in,struct file_list - if (fd1 != -1 && do_fstat(fd1,&st) != 0) { - rsyserr(FERROR, errno, "fstat %s failed", - 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; - } -@@ -388,7 +399,7 @@ int recv_files(int f_in,struct file_list - */ - 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; - } -@@ -440,7 +451,7 @@ int recv_files(int f_in,struct file_list - if (fd2 == -1) { - rsyserr(FERROR, errno, "mkstemp %s failed", - full_fname(fnametmp)); -- 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; -@@ -453,7 +464,11 @@ int recv_files(int f_in,struct file_list - } + if (mapbuf) + unmap_file(mapbuf); +@@ -325,7 +336,7 @@ static int receive_data(int f_in, char * + + 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); + } + + +@@ -541,8 +552,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); +#endif -+ recv_ok = receive_data(f_in,mapbuf,fd2,fname,file->length,file->u.sum); + 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); ---- rsync.c 21 May 2004 08:43:03 -0000 1.140 -+++ rsync.c 21 May 2004 09:07:59 -0000 +--- orig/rsync.c 2004-07-31 16:41:04 ++++ rsync.c 2004-07-16 20:16:53 @@ -34,6 +34,7 @@ extern int force_delete; extern int recurse; + extern int keep_dirlinks; extern int make_backups; - extern char *backup_dir; +extern char *link_by_hash_dir; + extern char *backup_dir; + extern int inplace; - - /* -@@ -239,8 +240,12 @@ void finish_transfer(char *fname, char * - if (make_backups && !make_backup(fname)) - return; - -- /* move tmp file over real file */ -- ret = robust_rename(fnametmp, fname, file->mode & INITACCESSPERMS); +@@ -251,6 +252,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); +#ifdef HAVE_LINK + if (link_by_hash_dir) + ret = link_by_hash(fnametmp, fname, file); + else +#endif + ret = robust_rename(fnametmp, fname, file->mode & INITACCESSPERMS); + ret = robust_rename(fnametmp, fname, file->mode & INITACCESSPERMS); if (ret < 0) { rsyserr(FERROR, errno, "%s %s -> \"%s\"", - ret == -2 ? "copy" : "rename", ---- rsync.h 16 May 2004 07:28:24 -0000 1.204 -+++ rsync.h 21 May 2004 09:07:59 -0000 -@@ -522,6 +522,14 @@ struct stats { +--- orig/rsync.h 2004-08-03 15:41:32 ++++ rsync.h 2004-07-03 20:20:15 +@@ -525,6 +525,14 @@ struct stats { int current_file_index; };