--- 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 \
+@@ -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
-OBJS3=progress.o pipe.o
+OBJS3=progress.o pipe.o hashlink.o
popt/popthelp.o popt/poptparse.o
--- old/flist.c
+++ new/flist.c
-@@ -57,6 +57,7 @@ extern int copy_unsafe_links;
+@@ -59,6 +59,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 char curr_dir[MAXPATHLEN];
-@@ -621,7 +622,7 @@ static struct file_struct *recv_file_ent
+
+@@ -715,7 +716,7 @@ static struct file_struct *recv_file_ent
}
#endif
+ char *linkname;
+ long last_fnbr;
+
-+ if (file->length == 0)
++ if (F_LENGTH(file) == 0)
+ return robust_rename(fnametmp, fname, NULL, 0644);
+
+ if (do_stat(hashname, &st) == -1) {
+#endif
--- old/options.c
+++ new/options.c
-@@ -145,6 +145,7 @@ char *backup_suffix = NULL;
+@@ -144,6 +144,7 @@ char *backup_suffix = NULL;
char *tmpdir = NULL;
char *partial_dir = NULL;
char *basis_dir[MAX_BASIS_DIRS+1];
{"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
+@@ -1093,6 +1096,21 @@ int parse_arguments(int *argc, const cha
usage(FINFO);
exit_cleanup(0);
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
+@@ -1755,6 +1773,11 @@ void server_options(char **args,int *arg
}
}
args[ac++] = "--files-from";
--- old/receiver.c
+++ new/receiver.c
-@@ -124,12 +124,13 @@ int get_tmpname(char *fnametmp, char *fn
+@@ -123,12 +123,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 *md4)
{
static char file_sum1[MD4_SUM_LENGTH];
static char file_sum2[MD4_SUM_LENGTH];
int32 len;
OFF_T offset = 0;
OFF_T offset2;
-@@ -149,6 +150,9 @@ static int receive_data(int f_in, char *
+@@ -148,6 +150,9 @@ static int receive_data(int f_in, char *
} else
mapbuf = NULL;
+
sum_init(checksum_seed);
- if (append_mode) {
-@@ -191,6 +195,8 @@ static int receive_data(int f_in, char *
+ if (append_mode > 0) {
+@@ -190,6 +195,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;
-@@ -217,6 +223,8 @@ static int receive_data(int f_in, char *
+@@ -216,6 +223,8 @@ static int receive_data(int f_in, char *
see_token(map, len);
sum_update(map, len);
}
if (updating_basis) {
-@@ -259,6 +267,8 @@ static int receive_data(int f_in, char *
+@@ -258,6 +267,8 @@ static int receive_data(int f_in, char *
}
sum_end(file_sum1);
if (mapbuf)
unmap_file(mapbuf);
-@@ -274,7 +284,7 @@ static int receive_data(int f_in, char *
+@@ -273,7 +284,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)
+ static void handle_delayed_updates(char *local_name)
+@@ -622,7 +633,7 @@ int recv_files(int f_in, char *local_nam
+
+ /* recv file data */
+ recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size,
+- fname, fd2, F_LENGTH(file));
++ fname, fd2, F_LENGTH(file), F_SUM(file));
+
+ log_item(log_code, file, &initial_stats, iflags, NULL);
+
--- old/rsync.c
+++ new/rsync.c
-@@ -49,6 +49,7 @@ extern int inplace;
+@@ -51,6 +51,7 @@ 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 *
+
+@@ -373,8 +374,15 @@ void finish_transfer(char *fname, char *
/* move tmp file over real file */
if (verbose > 2)
rprintf(FINFO, "renaming %s to %s\n", fnametmp, fname);
ret == -2 ? "copy" : "rename",
--- old/rsync.h
+++ new/rsync.h
-@@ -692,6 +692,14 @@ struct stats {
+@@ -750,6 +750,14 @@ struct stats {
int current_file_index;
};