X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/8aec0853fa3749d072b8e46ddefe5e38c719f76d..206a087d04fb7abc822e9f3c8da4dc2610a1d773:/link-by-hash.diff diff --git a/link-by-hash.diff b/link-by-hash.diff index a4a4675..5d72765 100644 --- a/link-by-hash.diff +++ b/link-by-hash.diff @@ -14,10 +14,10 @@ To use this patch, run these commands for a successful build: --- old/Makefile.in +++ new/Makefile.in -@@ -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 chmod.o +@@ -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 \ + 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 @@ -25,16 +25,16 @@ To use this patch, run these commands for a successful build: popt/popthelp.o popt/poptparse.o --- old/flist.c +++ new/flist.c -@@ -57,6 +57,7 @@ extern int copy_unsafe_links; +@@ -61,6 +61,7 @@ extern int copy_unsafe_links; extern int protocol_version; extern int sanitize_paths; extern struct stats stats; +extern char *link_by_hash_dir; - extern struct file_list *the_file_list; - extern alloc_pool_t hlink_pool; -@@ -624,7 +625,7 @@ static struct file_struct *recv_file_ent - } + 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; #endif - if (always_checksum && S_ISREG(mode)) @@ -383,7 +383,7 @@ To use this patch, run these commands for a successful build: +#endif --- old/options.c +++ new/options.c -@@ -145,6 +145,7 @@ char *backup_suffix = NULL; +@@ -146,6 +146,7 @@ char *backup_suffix = NULL; char *tmpdir = NULL; char *partial_dir = NULL; char *basis_dir[MAX_BASIS_DIRS+1]; @@ -391,7 +391,7 @@ To use this patch, run these commands for a successful build: char *config_file = NULL; char *shell_cmd = NULL; char *logfile_name = NULL; -@@ -346,6 +347,7 @@ void usage(enum logcode F) +@@ -362,6 +363,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"); @@ -399,7 +399,7 @@ To use this patch, run these commands for a successful build: 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"); -@@ -395,7 +397,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP +@@ -411,7 +413,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP 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, @@ -408,7 +408,7 @@ To use this patch, run these commands for a successful build: OPT_SERVER, OPT_REFUSED_BASE = 9000}; static struct poptOption long_options[] = { -@@ -497,6 +499,7 @@ static struct poptOption long_options[] +@@ -523,6 +525,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 }, @@ -416,9 +416,9 @@ To use this patch, run these commands for a successful build: {"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 }, -@@ -1087,6 +1090,21 @@ int parse_arguments(int *argc, const cha - usage(FINFO); - exit_cleanup(0); +@@ -1148,6 +1151,21 @@ int parse_arguments(int *argc, const cha + return 0; + #endif + case OPT_LINK_BY_HASH: +#ifdef HAVE_LINK @@ -438,7 +438,7 @@ 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. */ -@@ -1745,6 +1763,11 @@ void server_options(char **args,int *arg +@@ -1814,6 +1832,11 @@ void server_options(char **args,int *arg } } @@ -452,23 +452,23 @@ To use this patch, run these commands for a successful build: args[ac++] = "--files-from"; --- old/receiver.c +++ new/receiver.c -@@ -124,12 +124,14 @@ int get_tmpname(char *fnametmp, char *fn +@@ -125,12 +125,14 @@ int get_tmpname(char *fnametmp, char *fn 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) +- const char *fname, int fd, OFF_T total_size) + const char *fname, int fd, OFF_T total_size, + const char *md4) { - static char file_sum1[MD4_SUM_LENGTH]; - static char file_sum2[MD4_SUM_LENGTH]; + static char file_sum1[MAX_DIGEST_LEN]; + static char file_sum2[MAX_DIGEST_LEN]; struct map_struct *mapbuf; struct sum_struct sum; -+ struct mdfour mdfour_data; - int32 len; ++ md_context mdfour_data; + int32 len, sum_len; OFF_T offset = 0; OFF_T offset2; -@@ -149,6 +151,9 @@ static int receive_data(int f_in, char * +@@ -150,6 +152,9 @@ static int receive_data(int f_in, char * } else mapbuf = NULL; @@ -477,8 +477,8 @@ To use this patch, run these commands for a successful build: + sum_init(checksum_seed); - if (append_mode) { -@@ -191,6 +196,8 @@ static int receive_data(int f_in, char * + if (append_mode > 0) { +@@ -192,6 +197,8 @@ static int receive_data(int f_in, char * cleanup_got_literal = 1; sum_update(data, i); @@ -487,7 +487,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; -@@ -217,6 +224,8 @@ static int receive_data(int f_in, char * +@@ -218,6 +225,8 @@ static int receive_data(int f_in, char * see_token(map, len); sum_update(map, len); @@ -496,16 +496,16 @@ To use this patch, run these commands for a successful build: } if (updating_basis) { -@@ -259,6 +268,8 @@ static int receive_data(int f_in, char * +@@ -260,6 +269,8 @@ static int receive_data(int f_in, char * } - sum_end(file_sum1); + sum_len = sum_end(file_sum1); + if (md4) -+ mdfour_result(&mdfour_data, (unsigned char*)md4); ++ mdfour_result(&mdfour_data, (uchar*)md4); if (mapbuf) unmap_file(mapbuf); -@@ -274,7 +285,7 @@ static int receive_data(int f_in, char * +@@ -275,7 +286,7 @@ static int receive_data(int f_in, char * static void discard_receive_data(int f_in, OFF_T length) { @@ -513,8 +513,8 @@ To use this patch, run these commands for a successful build: + receive_data(f_in, NULL, -1, 0, NULL, -1, length, NULL); } - static void handle_delayed_updates(struct file_list *flist, char *local_name) -@@ -604,7 +615,7 @@ int recv_files(int f_in, struct file_lis + static void handle_delayed_updates(char *local_name) +@@ -646,7 +657,7 @@ int recv_files(int f_in, char *local_nam /* recv file data */ recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size, @@ -525,15 +525,15 @@ To use this patch, run these commands for a successful build: --- old/rsync.c +++ new/rsync.c -@@ -49,6 +49,7 @@ extern int inplace; +@@ -51,6 +51,7 @@ extern int inplace; + extern int flist_eof; extern int keep_dirlinks; extern int make_backups; - extern mode_t orig_umask; +extern char *link_by_hash_dir; - extern struct stats stats; - extern struct file_list *the_file_list; + extern struct file_list *cur_flist, *first_flist, *dir_flist; extern struct chmod_mode_struct *daemon_chmod_modes; -@@ -324,8 +325,15 @@ void finish_transfer(char *fname, char * + +@@ -410,8 +411,15 @@ void finish_transfer(const char *fname, /* move tmp file over real file */ if (verbose > 2) rprintf(FINFO, "renaming %s to %s\n", fnametmp, fname); @@ -553,7 +553,7 @@ To use this patch, run these commands for a successful build: ret == -2 ? "copy" : "rename", --- old/rsync.h +++ new/rsync.h -@@ -685,6 +685,14 @@ struct stats { +@@ -758,6 +758,14 @@ struct stats { int current_file_index; }; @@ -567,10 +567,10 @@ To use this patch, run these commands for a successful build: + struct chmod_mode_struct; - #include "byteorder.h" + #define EMPTY_ITEM_LIST {NULL, 0, 0} --- old/rsync.yo +++ new/rsync.yo -@@ -367,6 +367,7 @@ to the detailed description below for a +@@ -369,6 +369,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