-After applying this patch and running configure, you MUST run this
-command before "make":
-
- make proto
-
-Jason M. Felice writes:
+Jason M. Felice wrote:
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.
+To use this patch, run these commands for a successful build:
+
+ patch -p1 <patches/link-by-hash.diff
+ ./prepare-source
+ ./configure
+ make
---- orig/Makefile.in 2006-01-14 08:14:29
-+++ Makefile.in 2005-11-07 04:37:17
-@@ -34,7 +34,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
+--- 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 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
---- orig/hashlink.c 2004-09-24 16:44:25
-+++ hashlink.c 2004-09-24 16:44:25
-@@ -0,0 +1,340 @@
+--- old/flist.c
++++ new/flist.c
+@@ -65,6 +65,7 @@ extern int protocol_version;
+ extern int sanitize_paths;
+ extern struct stats stats;
+ extern char *filesfrom_host;
++extern char *link_by_hash_dir;
+
+ extern char curr_dir[MAXPATHLEN];
+
+@@ -830,7 +831,7 @@ static struct file_struct *recv_file_ent
+ extra_len += (S_ISDIR(mode) ? 2 : 1) * 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 @@
+/*
+ Copyright (C) Cronosys, LLC 2004
+
+
+extern char *link_by_hash_dir;
+
-+#if HAVE_LINK
++#ifdef HAVE_LINK
+
-+char* make_hash_name(struct file_struct *file)
++char *make_hash_name(struct file_struct *file)
+{
+ char hash[33], *dst;
-+ unsigned char *src;
-+ unsigned char c;
++ uchar c, *src = (uchar*)F_SUM(file);
+ int i;
+
-+ src = (unsigned char*)file->u.sum;
+ for (dst = hash, i = 0; i < 4; i++, src++) {
+ c = *src >> 4;
+ *(dst++) = (c >= 10) ? (c - 10 + 'a') : (c + '0');
+}
+
+
-+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);
+ char *linkname;
+ long last_fnbr;
+
-+ if (file->length == 0) {
-+ return robust_rename(fnametmp,fname,0644);
-+ }
++ if (F_LENGTH(file) == 0)
++ return robust_rename(fnametmp, fname, NULL, 0644);
+
+ if (do_stat(hashname, &st) == -1) {
+ char *dirname;
+ rsyserr(FERROR, errno, "mkdir failed: %s", dirname);
+ free(hashname);
+ free(dirname);
-+ return robust_rename(fnametmp,fname,0644);
++ return robust_rename(fnametmp, fname, NULL, 0644);
+ }
+ free(dirname);
+
+ if (do_mkdir(hashname, 0755) == -1 && errno != EEXIST) {
+ rsyserr(FERROR, errno, "mkdir failed: %s", hashname);
+ free(hashname);
-+ return robust_rename(fnametmp,fname,0644);
++ return robust_rename(fnametmp, fname, NULL, 0644);
+ }
+
+ first = 1;
+ } else {
+ rsyserr(FERROR, errno, "link \"%s\" -> \"%s\"",
+ linkname, full_fname(fname));
-+ rc = robust_rename(fnametmp,fname,0644);
++ rc = robust_rename(fnametmp, fname, NULL, 0644);
+ }
+ } else {
+ do_unlink(fnametmp);
+ rprintf(FINFO, "link-by-hash (new): %s -> \"%s\"\n",
+ full_fname(fname),linkname);
+
-+ rc = robust_rename(fnametmp,fname,0644);
++ rc = robust_rename(fnametmp, fname, NULL, 0644);
+ if (rc != 0) {
+ rsyserr(FERROR, errno, "rename \"%s\" -> \"%s\"",
+ full_fname(fnametmp), full_fname(fname));
+ free(hashname);
+ return rc;
+}
-+
+#endif
---- orig/options.c 2006-01-31 03:11:30
-+++ options.c 2006-01-26 10:57:21
-@@ -144,6 +144,7 @@ char *backup_suffix = NULL;
+--- old/options.c
++++ new/options.c
+@@ -153,6 +153,7 @@ char *backup_suffix = NULL;
char *tmpdir = NULL;
char *partial_dir = NULL;
char *basis_dir[MAX_BASIS_DIRS+1];
+char *link_by_hash_dir = NULL;
char *config_file = NULL;
char *shell_cmd = NULL;
- char *log_format = NULL;
-@@ -337,6 +338,7 @@ void usage(enum logcode F)
+ char *logfile_name = NULL;
+@@ -385,6 +386,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");
-@@ -383,7 +385,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP
+ rprintf(F," --skip-compress=LIST skip compressing files with a suffix in LIST\n");
+@@ -437,7 +439,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,
-- OPT_NO_D,
-+ OPT_NO_D, OPT_LINK_BY_HASH,
+- OPT_NO_D, OPT_APPEND,
++ OPT_NO_D, OPT_APPEND, OPT_LINK_BY_HASH,
OPT_SERVER, OPT_REFUSED_BASE = 9000};
static struct poptOption long_options[] = {
-@@ -478,6 +480,7 @@ static struct poptOption long_options[]
+@@ -561,6 +563,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 },
-@@ -1057,6 +1060,21 @@ int parse_arguments(int *argc, const cha
- usage(FINFO);
- exit_cleanup(0);
+ {"no-compress", 0, POPT_ARG_VAL, &do_compression, 0, 0, 0 },
+@@ -1219,6 +1222,21 @@ int parse_arguments(int *argc_p, const c
+ return 0;
+ #endif
+ case OPT_LINK_BY_HASH:
-+#if HAVE_LINK
++#ifdef HAVE_LINK
+ arg = poptGetOptArg(pc);
+ if (sanitize_paths)
-+ arg = sanitize_path(NULL, arg, NULL, 0);
++ arg = sanitize_path(NULL, arg, NULL, 0, NULL);
+ link_by_hash_dir = (char *)arg;
+ break;
+#else
default:
/* A large opt value means that set_refuse_options()
* turned this option off. */
-@@ -1706,6 +1724,11 @@ void server_options(char **args,int *arg
- }
- }
+@@ -1965,6 +1983,11 @@ void server_options(char **args, int *ar
+ } else if (inplace)
+ args[ac++] = "--inplace";
+ if (link_by_hash_dir && am_sender) {
+ args[ac++] = "--link-by-hash";
if (files_from && (!am_sender || filesfrom_host)) {
if (filesfrom_host) {
args[ac++] = "--files-from";
---- orig/receiver.c 2006-01-31 02:30:18
-+++ receiver.c 2005-01-15 21:29:13
-@@ -54,6 +54,7 @@ extern int delay_updates;
- extern struct stats stats;
- extern char *log_format;
- extern char *tmpdir;
-+extern char *link_by_hash_dir;
- extern char *partial_dir;
- extern char *basis_dir[];
- extern struct file_list *the_file_list;
-@@ -186,12 +187,13 @@ static int get_tmpname(char *fnametmp, c
+--- old/receiver.c
++++ new/receiver.c
+@@ -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)
-+ char *fname, int fd, OFF_T total_size, char *md4)
+- 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;
-@@ -211,6 +213,9 @@ static int receive_data(int f_in, char *
+@@ -150,6 +152,9 @@ static int receive_data(int f_in, char *
} else
mapbuf = NULL;
+
sum_init(checksum_seed);
- if (append_mode) {
-@@ -253,6 +258,8 @@ static int receive_data(int f_in, char *
+ if (append_mode > 0) {
+@@ -194,6 +199,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);
++ mdfour_update(&mdfour_data, (uchar*)data, i);
if (fd != -1 && write_file(fd,data,i) != i)
goto report_write_error;
-@@ -279,6 +286,8 @@ static int receive_data(int f_in, char *
+@@ -220,6 +227,8 @@ static int receive_data(int f_in, char *
see_token(map, len);
sum_update(map, len);
+ if (md4)
-+ mdfour_update(&mdfour_data,map,len);
++ mdfour_update(&mdfour_data, (uchar*)map, len);
}
- if (inplace) {
-@@ -319,6 +328,8 @@ static int receive_data(int f_in, char *
+ if (updating_basis) {
+@@ -262,6 +271,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);
-@@ -334,7 +345,7 @@ static int receive_data(int f_in, char *
+@@ -277,7 +288,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, NULL);
}
- static void handle_delayed_updates(struct file_list *flist, char *local_name)
-@@ -666,8 +677,12 @@ int recv_files(int f_in, struct file_lis
- rprintf(FINFO, "%s\n", fname);
+ static void handle_delayed_updates(char *local_name)
+@@ -665,7 +676,7 @@ int recv_files(int f_in, char *local_nam
/* recv file data */
-+#if HAVE_LINK
-+ if (link_by_hash_dir)
-+ file->u.sum = new_array(char, MD4_SUM_LENGTH);
-+#endif
recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size,
-- fname, fd2, file->length);
-+ fname, fd2, file->length, file->u.sum);
+- fname, fd2, F_LENGTH(file));
++ fname, fd2, F_LENGTH(file), F_SUM(file));
+
+ log_item(log_code, file, &initial_stats, iflags, NULL);
- if (!log_before_transfer)
- log_item(file, &initial_stats, iflags, NULL);
---- orig/rsync.c 2006-01-31 02:30:18
-+++ rsync.c 2006-01-30 07:19:44
-@@ -40,6 +40,7 @@ extern int inplace;
+--- old/rsync.c
++++ new/rsync.c
+@@ -47,6 +47,7 @@ extern int inplace;
+ extern int flist_eof;
extern int keep_dirlinks;
extern int make_backups;
- extern struct stats stats;
+extern char *link_by_hash_dir;
-
-
- /*
-@@ -213,8 +214,15 @@ void finish_transfer(char *fname, char *
+ extern struct file_list *cur_flist, *first_flist, *dir_flist;
+ extern struct chmod_mode_struct *daemon_chmod_modes;
+ #ifdef ICONV_OPTION
+@@ -529,8 +530,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);
- ret = robust_rename(fnametmp, fname, partialptr,
- file->mode & INITACCESSPERMS);
-+#if HAVE_LINK
++#ifdef HAVE_LINK
+ if (link_by_hash_dir)
+ ret = link_by_hash(fnametmp, fname, file);
+ else
if (ret < 0) {
rsyserr(FERROR, errno, "%s %s -> \"%s\"",
ret == -2 ? "copy" : "rename",
---- orig/rsync.h 2006-01-30 20:39:09
-+++ rsync.h 2006-01-30 20:42:44
-@@ -640,6 +640,14 @@ struct stats {
+--- old/rsync.h
++++ new/rsync.h
+@@ -768,6 +768,14 @@ struct stats {
int current_file_index;
};
+
struct chmod_mode_struct;
- #include "byteorder.h"
---- orig/rsync.yo 2006-01-31 03:05:44
-+++ rsync.yo 2005-02-13 06:58:47
-@@ -361,6 +361,7 @@ to the detailed description below for a
+ #define EMPTY_ITEM_LIST {NULL, 0, 0}
+--- old/rsync.yo
++++ new/rsync.yo
+@@ -392,6 +392,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
--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