+}
+
+#endif
---- orig/options.c 2004-11-27 18:27:35
+--- 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;
char *password_file = NULL;
+char *link_by_hash_dir = NULL;
char backup_dir_buf[MAXPATHLEN];
int rsync_port = 0;
- int copy_dest = 0;
+ int compare_dest = 0;
@@ -288,6 +289,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," -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");
-@@ -322,7 +324,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP
+@@ -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,
OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
OPT_REFUSED_BASE = 9000};
static struct poptOption long_options[] = {
-@@ -383,6 +385,7 @@ static struct poptOption long_options[]
+@@ -384,6 +386,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 },
-@@ -749,6 +752,21 @@ int parse_arguments(int *argc, const cha
+@@ -750,6 +753,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). */
-@@ -1225,6 +1243,11 @@ void server_options(char **args,int *arg
+@@ -1226,6 +1244,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 2004-11-27 17:57:31
-+++ receiver.c 2004-11-27 18:20:00
-@@ -40,6 +40,7 @@ extern int io_error;
+--- orig/receiver.c 2005-01-15 21:18:09
++++ receiver.c 2005-01-15 21:29:13
+@@ -38,6 +38,7 @@ extern int preserve_perms;
+ extern int cvs_exclude;
+ extern int io_error;
extern char *tmpdir;
++extern char *link_by_hash_dir;
extern char *partial_dir;
extern char *basis_dir[];
-+extern char *link_by_hash_dir;
- extern int make_backups;
- extern int do_progress;
- extern char *backup_dir;
-@@ -203,12 +204,13 @@ static int get_tmpname(char *fnametmp, c
+ extern int basis_dir_cnt;
+@@ -204,12 +205,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,
struct map_struct *mapbuf;
struct sum_struct sum;
+ struct mdfour mdfour_data;
- unsigned int len;
+ int32 len;
OFF_T offset = 0;
OFF_T offset2;
-@@ -228,6 +230,9 @@ static int receive_data(int f_in, char *
+@@ -229,6 +231,9 @@ static int receive_data(int f_in, char *
} else
mapbuf = NULL;
sum_init(checksum_seed);
while ((i = recv_token(f_in, &data)) != 0) {
-@@ -244,6 +249,8 @@ static int receive_data(int f_in, char *
+@@ -245,6 +250,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)
goto report_write_error;
-@@ -268,6 +275,8 @@ static int receive_data(int f_in, char *
+@@ -271,6 +278,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) {
-@@ -307,6 +316,8 @@ static int receive_data(int f_in, char *
+@@ -311,6 +320,8 @@ static int receive_data(int f_in, char *
}
sum_end(file_sum1);
if (mapbuf)
unmap_file(mapbuf);
-@@ -322,7 +333,7 @@ static int receive_data(int f_in, char *
+@@ -326,7 +337,7 @@ static int receive_data(int f_in, char *
static void discard_receive_data(int f_in, OFF_T length)
{
}
-@@ -550,8 +561,12 @@ int recv_files(int f_in, struct file_lis
+@@ -559,8 +570,12 @@ int recv_files(int f_in, struct file_lis
rprintf(FINFO, "%s\n", safe_fname(fname));
/* recv file data */
log_recv(file, &initial_stats);
---- orig/rsync.c 2004-09-07 21:45:30
+--- 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;
extern int recurse;
extern char *backup_dir;
extern int inplace;
-@@ -254,7 +255,12 @@ void finish_transfer(char *fname, char *
+@@ -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);
if (ret < 0) {
rsyserr(FERROR, errno, "%s %s -> \"%s\"",
ret == -2 ? "copy" : "rename",
---- orig/rsync.h 2004-11-27 17:53:24
+--- orig/rsync.h 2005-01-15 21:18:09
+++ rsync.h 2004-07-03 20:20:15
-@@ -536,6 +536,14 @@ struct stats {
+@@ -538,6 +538,14 @@ struct stats {
int current_file_index;
};