the file's name.
---- orig/Makefile.in 2004-07-04 08:59:17
+--- orig/Makefile.in 2004-11-03 11:56:03
+++ 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
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-07-02 21:41:54
-+++ hashlink.c 2004-07-02 21:41:54
-@@ -0,0 +1,342 @@
+--- orig/hashlink.c 2004-09-24 16:44:25
++++ hashlink.c 2004-09-24 16:44:25
+@@ -0,0 +1,340 @@
+/*
+ Copyright (C) Cronosys, LLC 2004
+
+
+extern char *link_by_hash_dir;
+
-+#ifdef HAVE_LINK
++#if HAVE_LINK
+
+char* make_hash_name(struct file_struct *file)
+{
+ long this_fnbr;
+
+ *fnbr = 0;
-+
++
+ /* Build a list of potential candidates and open
+ * them. */
+ if ((d = opendir(hashname)) == NULL) {
-+ rsyserr(FERROR, errno, "opendir \"%s\"", hashname);
++ rsyserr(FERROR, errno, "opendir failed: \"%s\"", hashname);
+ free(hashname);
+ return NULL;
+ }
+ asprintf(&hashfile->name,"%s/%s",hashname,
+ di->d_name);
+ if (do_stat(hashfile->name,&st) == -1) {
-+ rsyserr(FERROR, errno, "%s: %s", hashfile->name);
++ rsyserr(FERROR, errno, "stat failed: %s", hashfile->name);
+ kill_hashfile(hashfile);
+ continue;
+ }
+ hashfile->nlink = st.st_nlink;
+ hashfile->fd = open(hashfile->name,O_RDONLY|O_BINARY);
+ if (hashfile->fd == -1) {
-+ rsyserr(FERROR, errno, "%s", hashfile->name);
++ rsyserr(FERROR, errno, "open failed: %s", hashfile->name);
+ kill_hashfile(hashfile);
+ continue;
+ }
+ /* There are no matches. */
+ return NULL;
+ }
-+
+ }
+
+ if (amt == -1) {
-+ rsyserr(FERROR, errno, "%s");
++ rsyserr(FERROR, errno, "read failed in compare_hashfiles()");
+ kill_hashfiles(files);
+ return NULL;
+ }
+int link_by_hash(char *fnametmp,char *fname,struct file_struct *file)
+{
+ STRUCT_STAT st;
-+ char *hashname = make_hash_name(file);
++ char *hashname = make_hash_name(file);
+ int first = 0, rc;
+ char *linkname;
+ long last_fnbr;
+ dirname = strdup(hashname);
+ *strrchr(dirname,'/') = 0;
+ if (do_mkdir(dirname, 0755) == -1 && errno != EEXIST) {
-+ rsyserr(FERROR, errno, "mkdir %s", dirname);
++ rsyserr(FERROR, errno, "mkdir failed: %s", dirname);
+ free(hashname);
+ free(dirname);
+ return robust_rename(fnametmp,fname,0644);
+ free(dirname);
+
+ if (do_mkdir(hashname, 0755) == -1 && errno != EEXIST) {
-+ rsyserr(FERROR, errno, "mkdir %s", hashname);
++ rsyserr(FERROR, errno, "mkdir failed: %s", hashname);
+ free(hashname);
+ return robust_rename(fnametmp,fname,0644);
+ }
+ first = 1;
+ asprintf(&linkname,"%s/0",hashname);
+ rprintf(FINFO, "(1) linkname = %s\n", linkname);
-+
+ } else {
+ struct hashfile_struct *hashfiles, *hashfile;
-+ int fd;
+
+ if (do_stat(fnametmp,&st) == -1) {
-+ rsyserr(FERROR, errno, "%s", fname);
++ rsyserr(FERROR, errno, "stat failed: %s", fname);
+ return -1;
+ }
+ hashfiles = find_hashfiles(hashname, st.st_size, &last_fnbr);
+ asprintf(&linkname,"%s/0",hashname);
+ rprintf(FINFO, "(2) linkname = %s\n", linkname);
+ } else {
-+
++ int fd;
+ /* Search for one identical to us. */
+ if ((fd = open(fnametmp,O_RDONLY|O_BINARY)) == -1) {
-+ rsyserr(FERROR, errno, "%s", fnametmp);
++ rsyserr(FERROR, errno, "open failed: %s", fnametmp);
+ kill_hashfiles(hashfiles);
+ return -1;
+ }
+ hashfile = compare_hashfiles(fd, hashfiles);
+ hashfiles = NULL;
++ close(fd);
+
+ if (hashfile) {
+ first = 0;
+ if (!first) {
+ rprintf(FINFO, "link-by-hash (existing): \"%s\" -> %s\n",
+ linkname, full_fname(fname));
++ robust_unlink(fname);
+ rc = do_link(linkname, fname);
+ if (rc == -1) {
+ if (errno == EMLINK) {
+ } else {
+ rsyserr(FERROR, errno, "link \"%s\" -> \"%s\"",
+ linkname, full_fname(fname));
-+ robust_unlink(fname);
+ rc = robust_rename(fnametmp,fname,0644);
+ }
+ } else {
+}
+
+#endif
---- orig/options.c 2004-07-16 20:07:22
-+++ options.c 2004-07-03 20:20:15
-@@ -125,6 +125,7 @@ char *log_format = NULL;
+--- orig/options.c 2005-02-16 15:35:53
++++ options.c 2005-02-14 02:52:09
+@@ -132,6 +132,7 @@ char *log_format = NULL;
char *password_file = NULL;
char *rsync_path = RSYNC_PATH;
char *backup_dir = NULL;
+char *link_by_hash_dir = NULL;
char backup_dir_buf[MAXPATHLEN];
- int rsync_port = RSYNC_PORT;
- int link_dest = 0;
-@@ -276,6 +277,7 @@ void usage(enum logcode F)
- rprintf(F," -T --temp-dir=DIR create temporary files in directory DIR\n");
+ int rsync_port = 0;
+ int compare_dest = 0;
+@@ -309,6 +310,7 @@ void usage(enum logcode F)
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");
-@@ -316,7 +318,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,
+ 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," -C, --cvs-exclude auto-ignore files the same way CVS does\n");
+ rprintf(F," -f, --filter=RULE add a file-filtering RULE\n");
+@@ -348,7 +350,7 @@ void usage(enum logcode F)
+ 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_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
-- OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT,
-+ OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT, OPT_LINK_BY_HASH,
+- OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT, OPT_MAX_SIZE,
++ OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT, OPT_MAX_SIZE, OPT_LINK_BY_HASH,
OPT_REFUSED_BASE = 9000};
static struct poptOption long_options[] = {
-@@ -375,6 +377,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 },
-+ {"link-by-hash", 0, POPT_ARG_STRING, 0, OPT_LINK_BY_HASH, 0, 0},
+@@ -416,6 +418,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 },
/* 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 },
-@@ -601,6 +604,19 @@ int parse_arguments(int *argc, const cha
- return 0;
- #endif
+@@ -840,6 +843,21 @@ int parse_arguments(int *argc, const cha
+ basis_dir[basis_dir_cnt++] = (char *)arg;
+ break;
+ case OPT_LINK_BY_HASH:
+#if HAVE_LINK
-+ link_by_hash_dir = (char *)poptGetOptArg(pc);
-+ checksum_seed = FIXED_CHECKSUM_SEED;
++ arg = poptGetOptArg(pc);
++ if (sanitize_paths)
++ arg = sanitize_path(NULL, arg, NULL, 0);
++ link_by_hash_dir = (char *)arg;
+ break;
+#else
+ snprintf(err_buf, sizeof err_buf,
+
default:
/* A large opt value means that set_refuse_options()
- * turned this option off (opt-BASE is its index). */
-@@ -1007,6 +1023,11 @@ void server_options(char **args,int *arg
- args[ac++] = compare_dest;
+ * turned this option off. */
+@@ -1392,6 +1410,11 @@ void server_options(char **args,int *arg
+ }
}
+ if (link_by_hash_dir && am_sender) {
if (files_from && (!am_sender || remote_filesfrom_file)) {
if (remote_filesfrom_file) {
args[ac++] = "--files-from";
---- orig/receiver.c 2004-07-19 17:06:10
-+++ receiver.c 2004-07-19 17:07:31
-@@ -37,6 +37,7 @@ extern int cvs_exclude;
+--- orig/receiver.c 2005-02-16 15:35:53
++++ receiver.c 2005-01-15 21:29:13
+@@ -37,6 +37,7 @@ extern int preserve_hard_links;
+ extern int preserve_perms;
extern int io_error;
extern char *tmpdir;
- extern char *compare_dest;
+extern char *link_by_hash_dir;
- extern int make_backups;
- extern int do_progress;
- extern char *backup_dir;
-@@ -200,10 +201,11 @@ static int get_tmpname(char *fnametmp, c
+ extern char *partial_dir;
+ extern char *basis_dir[];
+ extern int basis_dir_cnt;
+@@ -140,12 +141,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;
+ int32 len;
OFF_T offset = 0;
OFF_T offset2;
-@@ -214,6 +216,9 @@ static int receive_data(int f_in,struct
-
- read_sum_head(f_in, &sum);
+@@ -165,6 +167,9 @@ static int receive_data(int f_in, char *
+ } else
+ mapbuf = NULL;
+ if (md4)
+ mdfour_begin(&mdfour_data);
sum_init(checksum_seed);
while ((i = recv_token(f_in, &data)) != 0) {
-@@ -230,6 +235,8 @@ static int receive_data(int f_in,struct
+@@ -181,6 +186,8 @@ static int receive_data(int f_in, char *
cleanup_got_literal = 1;
- sum_update(data,i);
+ 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",
-@@ -257,6 +264,8 @@ static int receive_data(int f_in,struct
+ if (fd != -1 && write_file(fd,data,i) != i)
+ goto report_write_error;
+@@ -207,6 +214,8 @@ static int receive_data(int f_in, char *
see_token(map, len);
- sum_update(map,len);
+ sum_update(map, len);
+ if (md4)
+ mdfour_update(&mdfour_data,map,len);
}
- if (!inplace || offset != offset2) {
-@@ -293,6 +302,8 @@ static int receive_data(int f_in,struct
+ if (inplace) {
+@@ -247,6 +256,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)
-@@ -305,7 +316,7 @@ static int receive_data(int f_in,struct
+ if (mapbuf)
+ unmap_file(mapbuf);
+@@ -292,7 +303,7 @@ static void read_gen_name(int fd, char *
static void discard_receive_data(int f_in, OFF_T length)
{
-- receive_data(f_in, NULL, -1, NULL, length);
-+ receive_data(f_in, NULL, -1, NULL, length, NULL);
+- receive_data(f_in, NULL, -1, 0, NULL, -1, length);
++ receive_data(f_in, NULL, -1, 0, NULL, -1, length, NULL);
}
-@@ -510,7 +521,11 @@ int recv_files(int f_in, struct file_lis
- rprintf(FINFO, "%s\n", fname);
+@@ -555,8 +566,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 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);
-
- log_recv(file, &initial_stats);
+ recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size,
+- fname, fd2, file->length);
++ fname, fd2, file->length, file->u.sum);
---- orig/rsync.c 2004-07-16 20:07:23
-+++ rsync.c 2004-07-16 20:16:53
-@@ -33,6 +33,7 @@ extern int preserve_gid;
- extern int force_delete;
+ if (!log_before_transfer)
+ log_recv(file, &initial_stats, iflags);
+--- orig/rsync.c 2005-02-14 02:45:10
++++ rsync.c 2005-02-07 21:11:30
+@@ -36,6 +36,7 @@ extern int force_delete;
extern int recurse;
+ extern int keep_dirlinks;
extern int make_backups;
+extern char *link_by_hash_dir;
extern char *backup_dir;
extern int inplace;
-@@ -250,6 +251,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
+@@ -287,7 +288,12 @@ void finish_transfer(char *fname, char *
+ rprintf(FINFO, "renaming %s to %s\n",
+ safe_fname(fnametmp), safe_fname(fname));
+ }
+- ret = robust_rename(fnametmp, fname, file->mode & INITACCESSPERMS);
++#if 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\"",
---- orig/rsync.h 2004-07-16 20:07:23
+ ret == -2 ? "copy" : "rename",
+--- orig/rsync.h 2005-02-16 15:35:54
+++ rsync.h 2004-07-03 20:20:15
-@@ -524,6 +524,14 @@ struct stats {
+@@ -618,6 +618,14 @@ struct stats {
int current_file_index;
};
+};
+
- /* we need this function because of the silly way in which duplicate
- entries are handled in the file lists - we can't change this
+ #include "byteorder.h"
+ #include "lib/mdfour.h"
+--- orig/rsync.yo 2005-02-16 15:35:54
++++ rsync.yo 2005-02-13 06:58:47
+@@ -355,6 +355,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
+ -C, --cvs-exclude auto-ignore files in the same way CVS does
+ -f, --filter=RULE add a file-filtering RULE