X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/9be39c35eb557af44b58ff152b16a9831fa2baf7..d5753a220d76c6fa93b24845c6569e8bf29fd883:/link-by-hash.diff diff --git a/link-by-hash.diff b/link-by-hash.diff index 49d2ad7..f0ba55d 100644 --- a/link-by-hash.diff +++ b/link-by-hash.diff @@ -367,9 +367,9 @@ the file's name. +} + +#endif ---- orig/options.c 2004-07-15 16:51:50 +--- orig/options.c 2004-08-03 15:41:32 +++ options.c 2004-07-03 20:20:15 -@@ -124,6 +124,7 @@ char *log_format = NULL; +@@ -127,6 +127,7 @@ char *log_format = NULL; char *password_file = NULL; char *rsync_path = RSYNC_PATH; char *backup_dir = NULL; @@ -377,15 +377,15 @@ the file's name. char backup_dir_buf[MAXPATHLEN]; int rsync_port = RSYNC_PORT; int link_dest = 0; -@@ -269,6 +270,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"); -@@ -309,7 +311,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, @@ -394,7 +394,7 @@ the file's name. OPT_REFUSED_BASE = 9000}; static struct poptOption long_options[] = { -@@ -367,6 +369,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 }, -@@ -593,6 +596,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). */ -@@ -969,6 +985,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"; ---- orig/receiver.c 2004-07-14 17:12:06 -+++ receiver.c 2004-07-03 20:20:15 -@@ -48,6 +48,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) - { -@@ -196,10 +197,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; -@@ -210,6 +212,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) { -@@ -226,6 +231,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", -@@ -253,6 +260,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,67 +486,50 @@ the file's name. + mdfour_update(&mdfour_data,map,len); } - if (fd != -1 && write_file(fd, map, len) != (int)len) { -@@ -275,6 +284,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) -@@ -374,7 +385,7 @@ int recv_files(int f_in, struct file_lis - 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; - } -@@ -387,7 +398,7 @@ int recv_files(int f_in, struct file_lis - */ - 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; - } -@@ -443,7 +454,7 @@ int recv_files(int f_in, struct file_lis - 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) -@@ -457,7 +468,11 @@ int recv_files(int f_in, struct file_lis - rprintf(FINFO, "%s\n", fname); + 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); ---- orig/rsync.c 2004-07-02 18:06:32 -+++ rsync.c 2004-07-03 20:20:15 +--- 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; - - /* -@@ -242,6 +243,12 @@ void finish_transfer(char *fname, char * +@@ -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); @@ -557,9 +542,9 @@ the file's name. ret = robust_rename(fnametmp, fname, file->mode & INITACCESSPERMS); if (ret < 0) { rsyserr(FERROR, errno, "%s %s -> \"%s\"", ---- orig/rsync.h 2004-07-07 08:27:00 +--- orig/rsync.h 2004-08-03 15:41:32 +++ rsync.h 2004-07-03 20:20:15 -@@ -522,6 +522,14 @@ struct stats { +@@ -525,6 +525,14 @@ struct stats { int current_file_index; };