+}
+
+#endif
---- orig/options.c 2005-02-19 09:27:48
+--- orig/options.c 2005-02-20 00:02:23
+++ options.c 2005-02-14 02:52:09
@@ -132,6 +132,7 @@ char *log_format = NULL;
char *password_file = NULL;
char backup_dir_buf[MAXPATHLEN];
int rsync_port = 0;
int compare_dest = 0;
-@@ -310,6 +311,7 @@ void usage(enum logcode F)
+@@ -311,6 +312,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");
-@@ -349,7 +351,7 @@ void usage(enum logcode F)
+@@ -350,7 +352,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_REFUSED_BASE = 9000};
static struct poptOption long_options[] = {
-@@ -417,6 +419,7 @@ static struct poptOption long_options[]
+@@ -418,6 +420,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 },
{"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 },
-@@ -838,6 +841,21 @@ int parse_arguments(int *argc, const cha
+@@ -849,6 +852,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. */
-@@ -1405,6 +1423,11 @@ void server_options(char **args,int *arg
+@@ -1416,6 +1434,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-02-19 09:27:48
+--- orig/receiver.c 2005-02-20 00:16:35
+++ 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;
+@@ -51,6 +51,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[];
- extern int basis_dir_cnt;
-@@ -140,12 +141,13 @@ static int get_tmpname(char *fnametmp, c
+
+@@ -142,12 +143,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;
-@@ -165,6 +167,9 @@ static int receive_data(int f_in, char *
+@@ -167,6 +169,9 @@ static int receive_data(int f_in, char *
} else
mapbuf = NULL;
sum_init(checksum_seed);
while ((i = recv_token(f_in, &data)) != 0) {
-@@ -181,6 +186,8 @@ static int receive_data(int f_in, char *
+@@ -183,6 +188,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;
-@@ -207,6 +214,8 @@ static int receive_data(int f_in, char *
+@@ -209,6 +216,8 @@ static int receive_data(int f_in, char *
see_token(map, len);
sum_update(map, len);
}
if (inplace) {
-@@ -247,6 +256,8 @@ static int receive_data(int f_in, char *
+@@ -249,6 +258,8 @@ static int receive_data(int f_in, char *
}
sum_end(file_sum1);
if (mapbuf)
unmap_file(mapbuf);
-@@ -292,7 +303,7 @@ static void read_gen_name(int fd, char *
+@@ -294,7 +305,7 @@ static void read_gen_name(int fd, char *
static void discard_receive_data(int f_in, OFF_T length)
{
}
-@@ -558,8 +569,12 @@ int recv_files(int f_in, struct file_lis
+@@ -562,8 +573,12 @@ int recv_files(int f_in, struct file_lis
rprintf(FINFO, "%s\n", safe_fname(fname));
/* recv file data */
if (!log_before_transfer)
log_recv(file, &initial_stats, iflags);
---- orig/rsync.c 2005-02-19 09:27:48
+--- orig/rsync.c 2005-02-20 00:02:23
+++ rsync.c 2005-02-19 09:32:31
-@@ -40,6 +40,7 @@ extern int keep_dirlinks;
+@@ -41,6 +41,7 @@ extern int keep_dirlinks;
extern int make_backups;
extern struct stats stats;
extern char *backup_dir;
+extern char *link_by_hash_dir;
extern char *log_format;
-
-
-@@ -279,7 +280,12 @@ void finish_transfer(char *fname, char *
+ extern char *backup_suffix;
+ extern int backup_suffix_len;
+@@ -306,7 +307,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-19 09:27:49
+--- orig/rsync.h 2005-02-20 00:02:23
+++ rsync.h 2004-07-03 20:20:15
-@@ -619,6 +619,14 @@ struct stats {
+@@ -620,6 +620,14 @@ struct stats {
int current_file_index;
};