the file's name.
---- orig/Makefile.in 2004-11-03 11:56:03
+--- orig/Makefile.in 2005-07-07 23:11:07
+++ Makefile.in 2004-07-03 20:20:15
-@@ -35,7 +35,7 @@ OBJS1=rsync.o generator.o receiver.o cle
+@@ -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
+ if (this_fnbr > *fnbr)
+ *fnbr = this_fnbr;
+
-+ hashfile = (struct hashfile_struct*)malloc(sizeof(struct hashfile_struct));
++ hashfile = new_array(struct hashfile_struct, 1);
+ asprintf(&hashfile->name,"%s/%s",hashname,
+ di->d_name);
+ if (do_stat(hashfile->name,&st) == -1) {
+}
+
+#endif
---- orig/options.c 2005-02-21 10:51:52
-+++ options.c 2005-02-14 02:52:09
-@@ -139,6 +139,7 @@ char *log_format = NULL;
+--- orig/options.c 2005-08-27 21:11:26
++++ options.c 2005-05-19 08:55:42
+@@ -141,6 +141,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;
-@@ -319,6 +320,7 @@ void usage(enum logcode F)
+@@ -322,6 +323,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," -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");
-@@ -358,7 +360,7 @@ void usage(enum logcode F)
+@@ -362,7 +364,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_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
++ OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, OPT_LINK_BY_HASH,
+ OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH, OPT_MAX_SIZE,
OPT_REFUSED_BASE = 9000};
- static struct poptOption long_options[] = {
-@@ -427,6 +429,7 @@ static struct poptOption long_options[]
+@@ -446,6 +448,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 },
-@@ -860,6 +863,21 @@ int parse_arguments(int *argc, const cha
+ {0, 'P', POPT_ARG_NONE, 0, 'P', 0, 0 },
+@@ -916,6 +919,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. */
-@@ -1440,6 +1458,11 @@ void server_options(char **args,int *arg
+@@ -1507,6 +1525,11 @@ void server_options(char **args,int *arg
}
}
+ args[ac++] = link_by_hash_dir;
+ }
+
- if (files_from && (!am_sender || remote_filesfrom_file)) {
- if (remote_filesfrom_file) {
+ if (files_from && (!am_sender || filesfrom_host)) {
+ if (filesfrom_host) {
args[ac++] = "--files-from";
---- orig/receiver.c 2005-02-20 20:55:51
+--- orig/receiver.c 2005-08-17 06:45:08
+++ receiver.c 2005-01-15 21:29:13
-@@ -52,6 +52,7 @@ extern int delay_updates;
+@@ -53,6 +53,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[];
-
-@@ -206,12 +207,13 @@ static int get_tmpname(char *fnametmp, c
+ extern struct file_list *the_file_list;
+@@ -186,12 +187,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;
-@@ -231,6 +233,9 @@ static int receive_data(int f_in, char *
+@@ -211,6 +213,9 @@ static int receive_data(int f_in, char *
} else
mapbuf = NULL;
+
sum_init(checksum_seed);
- while ((i = recv_token(f_in, &data)) != 0) {
-@@ -247,6 +252,8 @@ static int receive_data(int f_in, char *
+ if (append_mode) {
+@@ -253,6 +258,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;
-@@ -273,6 +280,8 @@ static int receive_data(int f_in, char *
+@@ -279,6 +286,8 @@ static int receive_data(int f_in, char *
see_token(map, len);
sum_update(map, len);
}
if (inplace) {
-@@ -313,6 +322,8 @@ static int receive_data(int f_in, char *
+@@ -319,6 +328,8 @@ static int receive_data(int f_in, char *
}
sum_end(file_sum1);
if (mapbuf)
unmap_file(mapbuf);
-@@ -358,7 +369,7 @@ static void read_gen_name(int fd, char *
+@@ -334,7 +345,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);
}
-
-@@ -621,8 +632,12 @@ int recv_files(int f_in, struct file_lis
+ static void handle_delayed_updates(struct file_list *flist, char *local_name)
+@@ -663,8 +674,12 @@ int recv_files(int f_in, struct file_lis
rprintf(FINFO, "%s\n", safe_fname(fname));
/* recv file data */
+#if HAVE_LINK
+ if (link_by_hash_dir)
-+ file->u.sum = (char*)malloc(MD4_SUM_LENGTH);
++ 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);
if (!log_before_transfer)
- log_recv(file, &initial_stats, iflags);
---- orig/rsync.c 2005-02-21 10:51:52
+ log_item(file, &initial_stats, iflags, NULL);
+--- orig/rsync.c 2005-07-27 23:31:12
+++ rsync.c 2005-02-21 11:04:36
-@@ -38,6 +38,7 @@ extern int recurse;
+@@ -38,6 +38,7 @@ extern int inplace;
extern int keep_dirlinks;
extern int make_backups;
extern struct stats stats;
/*
-@@ -188,7 +189,12 @@ void finish_transfer(char *fname, char *
+@@ -190,7 +191,12 @@ void finish_transfer(char *fname, char *
rprintf(FINFO, "renaming %s to %s\n",
safe_fname(fnametmp), safe_fname(fname));
}
if (ret < 0) {
rsyserr(FERROR, errno, "%s %s -> \"%s\"",
ret == -2 ? "copy" : "rename",
---- orig/rsync.h 2005-02-20 00:02:23
+--- orig/rsync.h 2005-08-17 06:45:08
+++ rsync.h 2004-07-03 20:20:15
-@@ -620,6 +620,14 @@ struct stats {
+@@ -639,6 +639,14 @@ struct stats {
int current_file_index;
};
#include "byteorder.h"
#include "lib/mdfour.h"
---- orig/rsync.yo 2005-02-20 01:12:43
+--- orig/rsync.yo 2005-08-27 21:05:12
+++ rsync.yo 2005-02-13 06:58:47
@@ -356,6 +356,7 @@ to the detailed description below for a
--compare-dest=DIR also compare received files relative to DIR
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff