+
+extern char *link_by_hash_dir;
+
-+#ifdef HAVE_LINK
++#if HAVE_LINK
+
+char* make_hash_name(struct file_struct *file)
+{
+}
+
+#endif
---- orig/options.c 2005-01-15 21:23:15
-+++ options.c 2004-11-27 18:19:42
-@@ -128,6 +128,7 @@ char *log_format = NULL;
+--- orig/options.c 2005-02-11 18:21:45
++++ options.c 2005-01-28 19:32:26
+@@ -131,6 +131,7 @@ char *log_format = NULL;
char *password_file = NULL;
char *rsync_path = RSYNC_PATH;
char *backup_dir = NULL;
char backup_dir_buf[MAXPATHLEN];
int rsync_port = 0;
int compare_dest = 0;
-@@ -288,6 +289,7 @@ void usage(enum logcode F)
+@@ -305,6 +306,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 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");
-@@ -323,7 +325,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP
- OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED,
- OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST,
+ 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");
+@@ -343,7 +345,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_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[] = {
-@@ -384,6 +386,7 @@ static struct poptOption long_options[]
+@@ -411,6 +413,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 },
/* TODO: Should this take an optional int giving the compression level? */
{"compress", 'z', POPT_ARG_NONE, &do_compression, 0, 0, 0 },
{"stats", 0, POPT_ARG_NONE, &do_stats, 0, 0, 0 },
-@@ -750,6 +753,21 @@ int parse_arguments(int *argc, const cha
+@@ -831,6 +834,21 @@ int parse_arguments(int *argc, const cha
basis_dir[basis_dir_cnt++] = (char *)arg;
break;
+
default:
/* A large opt value means that set_refuse_options()
- * turned this option off (opt-BASE is its index). */
-@@ -1226,6 +1244,11 @@ void server_options(char **args,int *arg
+ * turned this option off. */
+@@ -1366,6 +1384,11 @@ void server_options(char **args,int *arg
}
}
if (files_from && (!am_sender || remote_filesfrom_file)) {
if (remote_filesfrom_file) {
args[ac++] = "--files-from";
---- orig/receiver.c 2005-01-15 21:18:09
+--- orig/receiver.c 2005-02-11 10:53:14
+++ receiver.c 2005-01-15 21:29:13
-@@ -38,6 +38,7 @@ extern int preserve_perms;
- extern int cvs_exclude;
+@@ -35,6 +35,7 @@ extern int preserve_hard_links;
+ extern int preserve_perms;
extern int io_error;
extern char *tmpdir;
+extern char *link_by_hash_dir;
extern char *partial_dir;
extern char *basis_dir[];
extern int basis_dir_cnt;
-@@ -204,12 +205,13 @@ static int get_tmpname(char *fnametmp, c
+@@ -137,12 +138,13 @@ static int get_tmpname(char *fnametmp, c
static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
int32 len;
OFF_T offset = 0;
OFF_T offset2;
-@@ -229,6 +231,9 @@ static int receive_data(int f_in, char *
+@@ -162,6 +164,9 @@ static int receive_data(int f_in, char *
} else
mapbuf = NULL;
sum_init(checksum_seed);
while ((i = recv_token(f_in, &data)) != 0) {
-@@ -245,6 +250,8 @@ static int receive_data(int f_in, char *
+@@ -178,6 +183,8 @@ static int receive_data(int f_in, char *
cleanup_got_literal = 1;
sum_update(data, i);
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 *
+@@ -204,6 +211,8 @@ static int receive_data(int f_in, char *
see_token(map, len);
sum_update(map, len);
}
if (inplace) {
-@@ -311,6 +320,8 @@ static int receive_data(int f_in, char *
+@@ -244,6 +253,8 @@ static int receive_data(int f_in, char *
}
sum_end(file_sum1);
if (mapbuf)
unmap_file(mapbuf);
-@@ -326,7 +337,7 @@ static int receive_data(int f_in, char *
+@@ -259,7 +270,7 @@ static int receive_data(int f_in, char *
static void discard_receive_data(int f_in, OFF_T length)
{
}
-@@ -559,8 +570,12 @@ int recv_files(int f_in, struct file_lis
+@@ -501,8 +512,12 @@ int recv_files(int f_in, struct file_lis
rprintf(FINFO, "%s\n", safe_fname(fname));
/* recv file data */
-+#ifdef HAVE_LINK
++#if HAVE_LINK
+ if (link_by_hash_dir)
+ file->u.sum = (char*)malloc(MD4_SUM_LENGTH);
+#endif
log_recv(file, &initial_stats);
---- orig/rsync.c 2005-01-10 09:50:46
-+++ rsync.c 2004-08-13 18:14:34
-@@ -34,6 +34,7 @@ extern int force_delete;
+--- orig/rsync.c 2005-02-07 20:41:57
++++ 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 *backup_dir;
extern int inplace;
-@@ -259,7 +260,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);
+@@ -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);
-+#ifdef HAVE_LINK
++#if 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 2005-01-15 21:18:09
+--- orig/rsync.h 2005-02-07 20:41:57
+++ rsync.h 2004-07-03 20:20:15
-@@ -538,6 +538,14 @@ struct stats {
+@@ -600,6 +600,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-11 23:14:49
++++ rsync.yo 2005-01-28 19:32:45
+@@ -354,6 +354,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 to DIR for regular files
+ -z, --compress compress file data
+ -C, --cvs-exclude auto-ignore files in the same way CVS does
+ -f, --filter=RULE add a file-filtering RULE
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff