X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/5795bf59eae77f5d56b33a883708280b458f9fca..refs/heads/master:/link-by-hash.diff diff --git a/link-by-hash.diff b/link-by-hash.diff index 5d72765..53fff8f 100644 --- a/link-by-hash.diff +++ b/link-by-hash.diff @@ -12,39 +12,44 @@ To use this patch, run these commands for a successful build: ./configure make ---- old/Makefile.in -+++ new/Makefile.in -@@ -35,7 +35,7 @@ OBJS1=flist.o rsync.o generator.o receiv - util.o main.o checksum.o match.o syscall.o log.o backup.o - OBJS2=options.o io.o compat.o hlink.o token.o uidlist.o socket.o \ +based-on: a01e3b490eb36ccf9e704840e1b6683dab867550 +diff --git a/Makefile.in b/Makefile.in +--- a/Makefile.in ++++ b/Makefile.in +@@ -37,7 +37,7 @@ OBJS1=flist.o rsync.o generator.o receiver.o cleanup.o sender.o exclude.o \ + util.o main.o checksum.o match.o syscall.o log.o backup.o delete.o + OBJS2=options.o io.o compat.o hlink.o token.o uidlist.o socket.o hashtable.o \ fileio.o batch.o clientname.o chmod.o acls.o xattrs.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 ---- old/flist.c -+++ new/flist.c -@@ -61,6 +61,7 @@ extern int copy_unsafe_links; - extern int protocol_version; - extern int sanitize_paths; +diff --git a/flist.c b/flist.c +--- a/flist.c ++++ b/flist.c +@@ -74,6 +74,7 @@ extern int sender_keeps_checksum; + extern int unsort_ndx; extern struct stats stats; + extern char *filesfrom_host; +extern char *link_by_hash_dir; + extern char *usermap, *groupmap; extern char curr_dir[MAXPATHLEN]; - -@@ -748,7 +749,7 @@ static struct file_struct *recv_file_ent - extra_len += (S_ISDIR(mode) ? 2 : 1) * EXTRA_LEN; +@@ -910,7 +911,7 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x + extra_len += EXTRA_LEN; #endif - if (always_checksum && S_ISREG(mode)) + if ((always_checksum || link_by_hash_dir) && S_ISREG(mode)) extra_len += SUM_EXTRA_CNT * EXTRA_LEN; - if (file_length > 0xFFFFFFFFu && S_ISREG(mode)) ---- old/hashlink.c -+++ new/hashlink.c -@@ -0,0 +1,336 @@ + #if SIZEOF_INT64 >= 8 +diff --git a/hashlink.c b/hashlink.c +new file mode 100644 +--- /dev/null ++++ b/hashlink.c +@@ -0,0 +1,339 @@ +/* + Copyright (C) Cronosys, LLC 2004 + @@ -92,7 +97,8 @@ To use this patch, run these commands for a successful build: + } + *dst = 0; + -+ asprintf(&dst,"%s/%s",link_by_hash_dir,hash); ++ if (asprintf(&dst,"%s/%s",link_by_hash_dir,hash) < 0) ++ out_of_memory("make_hash_name"); + return dst; +} + @@ -149,8 +155,8 @@ To use this patch, run these commands for a successful build: + *fnbr = this_fnbr; + + hashfile = new_array(struct hashfile_struct, 1); -+ asprintf(&hashfile->name,"%s/%s",hashname, -+ di->d_name); ++ if (asprintf(&hashfile->name,"%s/%s",hashname, di->d_name) < 0) ++ out_of_memory("find_hashfiles"); + if (do_stat(hashfile->name,&st) == -1) { + rsyserr(FERROR, errno, "stat failed: %s", hashfile->name); + kill_hashfile(hashfile); @@ -264,7 +270,7 @@ To use this patch, run these commands for a successful build: +} + + -+int link_by_hash(char *fnametmp,char *fname,struct file_struct *file) ++int link_by_hash(const char *fnametmp, const char *fname, struct file_struct *file) +{ + STRUCT_STAT st; + char *hashname = make_hash_name(file); @@ -296,7 +302,8 @@ To use this patch, run these commands for a successful build: + } + + first = 1; -+ asprintf(&linkname,"%s/0",hashname); ++ if (asprintf(&linkname,"%s/0",hashname) < 0) ++ out_of_memory("link_by_hash"); + rprintf(FINFO, "(1) linkname = %s\n", linkname); + } else { + struct hashfile_struct *hashfiles, *hashfile; @@ -309,7 +316,8 @@ To use this patch, run these commands for a successful build: + + if (hashfiles == NULL) { + first = 1; -+ asprintf(&linkname,"%s/0",hashname); ++ if (asprintf(&linkname,"%s/0",hashname) < 0) ++ out_of_memory("link_by_hash"); + rprintf(FINFO, "(2) linkname = %s\n", linkname); + } else { + int fd; @@ -330,8 +338,8 @@ To use this patch, run these commands for a successful build: + kill_hashfile(hashfile); + } else { + first = 1; -+ asprintf(&linkname, "%s/%ld", hashname, -+ last_fnbr + 1); ++ if (asprintf(&linkname, "%s/%ld", hashname, last_fnbr + 1) < 0) ++ out_of_memory("link_by_hash"); + rprintf(FINFO, "(4) linkname = %s\n", linkname); + } + } @@ -346,8 +354,8 @@ To use this patch, run these commands for a successful build: + if (errno == EMLINK) { + first = 1; + free(linkname); -+ asprintf(&linkname,"%s/%ld",hashname, -+ last_fnbr + 1); ++ if (asprintf(&linkname,"%s/%ld",hashname, last_fnbr + 1) < 0) ++ out_of_memory("link_by_hash"); + rprintf(FINFO, "(5) linkname = %s\n", linkname); + rprintf(FINFO,"link-by-hash: max link count exceeded, starting new file \"%s\".\n", linkname); + } else { @@ -381,9 +389,10 @@ To use this patch, run these commands for a successful build: + return rc; +} +#endif ---- old/options.c -+++ new/options.c -@@ -146,6 +146,7 @@ char *backup_suffix = NULL; +diff --git a/options.c b/options.c +--- a/options.c ++++ b/options.c +@@ -158,6 +158,7 @@ char *backup_suffix = NULL; char *tmpdir = NULL; char *partial_dir = NULL; char *basis_dir[MAX_BASIS_DIRS+1]; @@ -391,32 +400,32 @@ To use this patch, run these commands for a successful build: char *config_file = NULL; char *shell_cmd = NULL; char *logfile_name = NULL; -@@ -362,6 +363,7 @@ void usage(enum logcode F) +@@ -746,6 +747,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 into DIR\n"); rprintf(F," -z, --compress compress file data during the transfer\n"); rprintf(F," --compress-level=NUM explicitly set compression level\n"); - rprintf(F," -C, --cvs-exclude auto-ignore files the same way CVS does\n"); -@@ -411,7 +413,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP + rprintf(F," --skip-compress=LIST skip compressing files with a suffix in LIST\n"); +@@ -798,7 +800,7 @@ 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_HELP, OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, OPT_MIN_SIZE, OPT_CHMOD, OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH, OPT_MAX_SIZE, -- OPT_NO_D, -+ OPT_NO_D, OPT_LINK_BY_HASH, +- OPT_NO_D, OPT_APPEND, OPT_NO_ICONV, OPT_INFO, OPT_DEBUG, ++ OPT_NO_D, OPT_APPEND, OPT_NO_ICONV, OPT_INFO, OPT_DEBUG, OPT_LINK_BY_HASH, + OPT_USERMAP, OPT_GROUPMAP, OPT_CHOWN, OPT_BWLIMIT, OPT_SERVER, OPT_REFUSED_BASE = 9000}; - static struct poptOption long_options[] = { -@@ -523,6 +525,7 @@ static struct poptOption long_options[] +@@ -938,6 +940,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 }, - {"compress", 'z', POPT_ARG_NONE, 0, 'z', 0, 0 }, - {"compress-level", 0, POPT_ARG_INT, &def_compress_level, 'z', 0, 0 }, -@@ -1148,6 +1151,21 @@ int parse_arguments(int *argc, const cha + {"fuzzy", 'y', POPT_ARG_VAL, &fuzzy_basis, 1, 0, 0 }, + {"no-fuzzy", 0, POPT_ARG_VAL, &fuzzy_basis, 0, 0, 0 }, + {"no-y", 0, POPT_ARG_VAL, &fuzzy_basis, 0, 0, 0 }, +@@ -1764,6 +1767,21 @@ int parse_arguments(int *argc_p, const char ***argv_p) return 0; #endif @@ -424,7 +433,7 @@ To use this patch, run these commands for a successful build: +#ifdef HAVE_LINK + arg = poptGetOptArg(pc); + if (sanitize_paths) -+ arg = sanitize_path(NULL, arg, NULL, 0, NULL); ++ arg = sanitize_path(NULL, arg, NULL, 0, SP_DEFAULT); + link_by_hash_dir = (char *)arg; + break; +#else @@ -438,9 +447,9 @@ To use this patch, run these commands for a successful build: default: /* A large opt value means that set_refuse_options() * turned this option off. */ -@@ -1814,6 +1832,11 @@ void server_options(char **args,int *arg - } - } +@@ -2636,6 +2654,11 @@ void server_options(char **args, int *argc_p) + } else if (inplace) + args[ac++] = "--inplace"; + if (link_by_hash_dir && am_sender) { + args[ac++] = "--link-by-hash"; @@ -450,10 +459,11 @@ To use this patch, run these commands for a successful build: if (files_from && (!am_sender || filesfrom_host)) { if (filesfrom_host) { args[ac++] = "--files-from"; ---- old/receiver.c -+++ new/receiver.c -@@ -125,12 +125,14 @@ int get_tmpname(char *fnametmp, char *fn - +diff --git a/receiver.c b/receiver.c +--- a/receiver.c ++++ b/receiver.c +@@ -196,11 +196,13 @@ int open_tmpfile(char *fnametmp, const char *fname, struct file_struct *file) + } static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r, - const char *fname, int fd, OFF_T total_size) @@ -461,14 +471,13 @@ To use this patch, run these commands for a successful build: + const char *md4) { static char file_sum1[MAX_DIGEST_LEN]; - static char file_sum2[MAX_DIGEST_LEN]; struct map_struct *mapbuf; struct sum_struct sum; + md_context mdfour_data; - int32 len, sum_len; + int32 len; OFF_T offset = 0; OFF_T offset2; -@@ -150,6 +152,9 @@ static int receive_data(int f_in, char * +@@ -220,6 +222,9 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r, } else mapbuf = NULL; @@ -478,7 +487,7 @@ To use this patch, run these commands for a successful build: sum_init(checksum_seed); if (append_mode > 0) { -@@ -192,6 +197,8 @@ static int receive_data(int f_in, char * +@@ -264,6 +269,8 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r, cleanup_got_literal = 1; sum_update(data, i); @@ -487,7 +496,7 @@ To use this patch, run these commands for a successful build: if (fd != -1 && write_file(fd,data,i) != i) goto report_write_error; -@@ -218,6 +225,8 @@ static int receive_data(int f_in, char * +@@ -290,6 +297,8 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r, see_token(map, len); sum_update(map, len); @@ -495,17 +504,18 @@ To use this patch, run these commands for a successful build: + mdfour_update(&mdfour_data, (uchar*)map, len); } - if (updating_basis) { -@@ -260,6 +269,8 @@ static int receive_data(int f_in, char * - } + if (updating_basis_or_equiv) { +@@ -337,6 +346,9 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r, + if (sum_end(file_sum1) != checksum_len) + overflow_exit("checksum_len"); /* Impossible... */ - sum_len = sum_end(file_sum1); + if (md4) + mdfour_result(&mdfour_data, (uchar*)md4); - ++ if (mapbuf) unmap_file(mapbuf); -@@ -275,7 +286,7 @@ static int receive_data(int f_in, char * + +@@ -351,7 +363,7 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r, static void discard_receive_data(int f_in, OFF_T length) { @@ -514,30 +524,31 @@ To use this patch, run these commands for a successful build: } static void handle_delayed_updates(char *local_name) -@@ -646,7 +657,7 @@ int recv_files(int f_in, char *local_nam +@@ -779,7 +791,7 @@ int recv_files(int f_in, int f_out, char *local_name) /* recv file data */ recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size, - fname, fd2, F_LENGTH(file)); + fname, fd2, F_LENGTH(file), F_SUM(file)); - log_item(log_code, file, &initial_stats, iflags, NULL); + log_item(log_code, file, iflags, NULL); ---- old/rsync.c -+++ new/rsync.c -@@ -51,6 +51,7 @@ extern int inplace; - extern int flist_eof; +diff --git a/rsync.c b/rsync.c +--- a/rsync.c ++++ b/rsync.c +@@ -49,6 +49,7 @@ extern int flist_eof; + extern int file_old_total; extern int keep_dirlinks; extern int make_backups; +extern char *link_by_hash_dir; extern struct file_list *cur_flist, *first_flist, *dir_flist; extern struct chmod_mode_struct *daemon_chmod_modes; - -@@ -410,8 +411,15 @@ void finish_transfer(const char *fname, + #ifdef ICONV_OPTION +@@ -644,8 +645,15 @@ int finish_transfer(const char *fname, const char *fnametmp, /* move tmp file over real file */ - if (verbose > 2) + if (DEBUG_GTE(RECV, 1)) rprintf(FINFO, "renaming %s to %s\n", fnametmp, fname); -- ret = robust_rename(fnametmp, fname, partialptr, +- ret = robust_rename(fnametmp, fname, temp_copy_name, - file->mode & INITACCESSPERMS); +#ifdef HAVE_LINK + if (link_by_hash_dir) @@ -545,16 +556,17 @@ To use this patch, run these commands for a successful build: + else +#endif + { -+ ret = robust_rename(fnametmp, fname, partialptr, ++ ret = robust_rename(fnametmp, fname, temp_copy_name, + file->mode & INITACCESSPERMS); + } if (ret < 0) { - rsyserr(FERROR, errno, "%s %s -> \"%s\"", + rsyserr(FERROR_XFER, errno, "%s %s -> \"%s\"", ret == -2 ? "copy" : "rename", ---- old/rsync.h -+++ new/rsync.h -@@ -758,6 +758,14 @@ struct stats { - int current_file_index; +diff --git a/rsync.h b/rsync.h +--- a/rsync.h ++++ b/rsync.h +@@ -865,6 +865,14 @@ struct stats { + int xferred_files; }; +struct hashfile_struct { @@ -567,14 +579,15 @@ To use this patch, run these commands for a successful build: + struct chmod_mode_struct; - #define EMPTY_ITEM_LIST {NULL, 0, 0} ---- old/rsync.yo -+++ new/rsync.yo -@@ -369,6 +369,7 @@ to the detailed description below for a + struct flist_ndx_item { +diff --git a/rsync.yo b/rsync.yo +--- a/rsync.yo ++++ b/rsync.yo +@@ -400,6 +400,7 @@ to the detailed description below for a complete description. verb( --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 --compress-level=NUM explicitly set compression level - -C, --cvs-exclude auto-ignore files in the same way CVS does + --skip-compress=LIST skip compressing files with suffix in LIST