+}
+
+#endif
---- 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;
+--- orig/options.c 2005-10-14 20:03:21
++++ options.c 2005-10-14 20:18:23
+@@ -142,6 +142,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;
-@@ -322,6 +323,7 @@ void usage(enum logcode F)
+@@ -323,6 +324,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");
-@@ -362,7 +364,7 @@ void usage(enum logcode F)
-
- enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
+@@ -365,7 +367,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP
OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST,
-- OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
-+ OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, OPT_LINK_BY_HASH,
+ OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, OPT_MIN_SIZE,
OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH, OPT_MAX_SIZE,
- OPT_REFUSED_BASE = 9000};
+- OPT_REFUSED_BASE = 9000};
++ OPT_LINK_BY_HASH, OPT_REFUSED_BASE = 9000};
-@@ -446,6 +448,7 @@ static struct poptOption long_options[]
+ static struct poptOption long_options[] = {
+ /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
+@@ -450,6 +452,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 },
{"compress", 'z', POPT_ARG_NONE, &do_compression, 0, 0, 0 },
{0, 'P', POPT_ARG_NONE, 0, 'P', 0, 0 },
-@@ -916,6 +919,21 @@ int parse_arguments(int *argc, const cha
+@@ -968,6 +971,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. */
-@@ -1507,6 +1525,11 @@ void server_options(char **args,int *arg
+@@ -1573,6 +1591,11 @@ void server_options(char **args,int *arg
}
}
if (files_from && (!am_sender || filesfrom_host)) {
if (filesfrom_host) {
args[ac++] = "--files-from";
---- orig/receiver.c 2005-08-17 06:45:08
+--- orig/receiver.c 2005-09-16 05:41:02
+++ receiver.c 2005-01-15 21:29:13
-@@ -53,6 +53,7 @@ extern int delay_updates;
+@@ -54,6 +54,7 @@ extern int delay_updates;
extern struct stats stats;
extern char *log_format;
extern char *tmpdir;
extern char *partial_dir;
extern char *basis_dir[];
extern struct file_list *the_file_list;
-@@ -186,12 +187,13 @@ static int get_tmpname(char *fnametmp, c
+@@ -187,12 +188,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;
-@@ -211,6 +213,9 @@ static int receive_data(int f_in, char *
+@@ -212,6 +214,9 @@ static int receive_data(int f_in, char *
} else
mapbuf = NULL;
sum_init(checksum_seed);
if (append_mode) {
-@@ -253,6 +258,8 @@ static int receive_data(int f_in, char *
+@@ -254,6 +259,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;
-@@ -279,6 +286,8 @@ static int receive_data(int f_in, char *
+@@ -280,6 +287,8 @@ static int receive_data(int f_in, char *
see_token(map, len);
sum_update(map, len);
}
if (inplace) {
-@@ -319,6 +328,8 @@ static int receive_data(int f_in, char *
+@@ -320,6 +329,8 @@ static int receive_data(int f_in, char *
}
sum_end(file_sum1);
if (mapbuf)
unmap_file(mapbuf);
-@@ -334,7 +345,7 @@ static int receive_data(int f_in, char *
+@@ -335,7 +346,7 @@ static int receive_data(int f_in, char *
static void discard_receive_data(int f_in, OFF_T length)
{
}
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
+@@ -669,8 +680,12 @@ int recv_files(int f_in, struct file_lis
rprintf(FINFO, "%s\n", safe_fname(fname));
/* recv file data */
if (ret < 0) {
rsyserr(FERROR, errno, "%s %s -> \"%s\"",
ret == -2 ? "copy" : "rename",
---- orig/rsync.h 2005-08-17 06:45:08
+--- orig/rsync.h 2005-10-14 18:45:50
+++ rsync.h 2004-07-03 20:20:15
-@@ -639,6 +639,14 @@ struct stats {
+@@ -644,6 +644,14 @@ struct stats {
int current_file_index;
};
#include "byteorder.h"
#include "lib/mdfour.h"
---- orig/rsync.yo 2005-08-27 21:05:12
+--- orig/rsync.yo 2005-10-14 20:03:01
+++ rsync.yo 2005-02-13 06:58:47
-@@ -356,6 +356,7 @@ to the detailed description below for a
+@@ -355,6 +355,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
if (verbose > 3) {
rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): entered\n",
code, safe_fname(file), line);
---- orig/clientserver.c 2005-08-17 06:45:07
+--- orig/clientserver.c 2005-10-14 18:45:50
+++ clientserver.c 2005-04-09 17:39:57
@@ -44,6 +44,9 @@ extern int io_timeout;
extern int orig_umask;
extern char *bind_address;
extern struct filter_list_struct server_filter_list;
extern char *config_file;
-@@ -98,8 +101,18 @@ int start_socket_client(char *host, char
+@@ -99,8 +102,18 @@ int start_socket_client(char *host, char
exit_cleanup(RERR_SOCKETIO);
ret = start_inband_exchange(user, path, fd, fd, argc);
}
int start_inband_exchange(char *user, char *path, int f_in, int f_out,
-@@ -160,6 +173,33 @@ int start_inband_exchange(char *user, ch
+@@ -161,6 +174,33 @@ int start_inband_exchange(char *user, ch
if (verbose > 1)
print_child_argv(sargs);
p = strchr(path,'/');
if (p) *p = 0;
io_printf(f_out, "%s\n", path);
-@@ -188,6 +228,10 @@ int start_inband_exchange(char *user, ch
+@@ -189,6 +229,10 @@ int start_inband_exchange(char *user, ch
* server to terminate the listing of modules.
* We don't want to go on and transfer
* anything; just exit. */
exit(0);
}
-@@ -195,6 +239,10 @@ int start_inband_exchange(char *user, ch
+@@ -196,6 +240,10 @@ int start_inband_exchange(char *user, ch
rprintf(FERROR, "%s\n", line);
/* This is always fatal; the server will now
* close the socket. */
return -1;
}
-@@ -597,6 +645,7 @@ static void send_listing(int fd)
+@@ -608,6 +656,7 @@ static void send_listing(int fd)
io_printf(fd,"@RSYNCD: EXIT\n");
}
/* this is called when a connection is established to a client
and we want to start talking. The setup of the system is done from
here */
-@@ -646,6 +695,9 @@ int start_daemon(int f_in, int f_out)
+@@ -657,6 +706,9 @@ int start_daemon(int f_in, int f_out)
if (protocol_version > remote_protocol)
protocol_version = remote_protocol;
line[0] = 0;
if (!read_line(f_in, line, sizeof line - 1))
return -1;
-@@ -655,6 +707,20 @@ int start_daemon(int f_in, int f_out)
+@@ -666,6 +718,20 @@ int start_daemon(int f_in, int f_out)
return -1;
}
if (*line == '#') {
/* it's some sort of command that I don't understand */
io_printf(f_out, "@ERROR: Unknown command '%s'\n", line);
---- orig/configure.in 2005-07-29 02:47:19
+--- orig/configure.in 2005-09-24 17:40:30
+++ configure.in 2004-07-03 20:22:28
@@ -293,6 +293,21 @@ yes
AC_SEARCH_LIBS(getaddrinfo, inet6)
AC_MSG_CHECKING([whether to call shutdown on all sockets])
case $host_os in
*cygwin* ) AC_MSG_RESULT(yes)
---- orig/options.c 2005-08-27 21:11:26
-+++ options.c 2005-08-27 21:24:31
-@@ -157,6 +157,14 @@ int log_format_has_o_or_i = 0;
+--- orig/options.c 2005-10-14 20:03:21
++++ options.c 2005-10-14 20:19:39
+@@ -158,6 +158,14 @@ int log_format_has_o_or_i = 0;
int always_checksum = 0;
int list_only = 0;
#define MAX_BATCH_NAME_LEN 256 /* Must be less than MAXPATHLEN-13 */
char *batch_name = NULL;
-@@ -183,6 +191,7 @@ static void print_rsync_version(enum log
+@@ -184,6 +192,7 @@ static void print_rsync_version(enum log
char const *hardlinks = "no ";
char const *links = "no ";
char const *ipv6 = "no ";
STRUCT_STAT *dumstat;
#ifdef HAVE_SOCKETPAIR
-@@ -205,6 +214,10 @@ static void print_rsync_version(enum log
+@@ -206,6 +215,10 @@ static void print_rsync_version(enum log
ipv6 = "";
#endif
rprintf(f, "%s version %s protocol version %d\n",
RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION);
rprintf(f,
-@@ -218,10 +231,10 @@ static void print_rsync_version(enum log
+@@ -219,10 +232,10 @@ static void print_rsync_version(enum log
/* Note that this field may not have type ino_t. It depends
* on the complicated interaction between largefile feature
* macros. */
#ifdef MAINTAINER_MODE
rprintf(f, " panic action: \"%s\"\n",
get_panic_action());
-@@ -352,6 +365,13 @@ void usage(enum logcode F)
+@@ -353,6 +366,13 @@ void usage(enum logcode F)
rprintf(F," -4, --ipv4 prefer IPv4\n");
rprintf(F," -6, --ipv6 prefer IPv6\n");
#endif
rprintf(F," --version print version number\n");
rprintf(F," -h, --help show this help screen\n");
-@@ -362,7 +382,7 @@ void usage(enum logcode F)
-
- enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
+@@ -365,7 +385,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP
OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST,
-- OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
-+ OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, OPT_USE_SSL,
+ OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, OPT_MIN_SIZE,
OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH, OPT_MAX_SIZE,
- OPT_REFUSED_BASE = 9000};
+- OPT_REFUSED_BASE = 9000};
++ OPT_USE_SSL, OPT_REFUSED_BASE = 9000};
-@@ -485,6 +505,13 @@ static struct poptOption long_options[]
+ static struct poptOption long_options[] = {
+ /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
+@@ -489,6 +509,13 @@ static struct poptOption long_options[]
{"checksum-seed", 0, POPT_ARG_INT, &checksum_seed, 0, 0, 0 },
{"server", 0, POPT_ARG_NONE, &am_server, 0, 0, 0 },
{"sender", 0, POPT_ARG_NONE, 0, OPT_SENDER, 0, 0 },
/* All the following options switch us into daemon-mode option-parsing. */
{"config", 0, POPT_ARG_STRING, 0, OPT_DAEMON, 0, 0 },
{"daemon", 0, POPT_ARG_NONE, 0, OPT_DAEMON, 0, 0 },
-@@ -916,6 +943,12 @@ int parse_arguments(int *argc, const cha
+@@ -968,6 +995,12 @@ 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. */
-@@ -1174,6 +1207,17 @@ int parse_arguments(int *argc, const cha
+@@ -1234,6 +1267,17 @@ int parse_arguments(int *argc, const cha
if (delay_updates && !partial_dir)
partial_dir = partialdir_for_delayupdate;
if (inplace) {
#ifdef HAVE_FTRUNCATE
if (partial_dir) {
-@@ -1547,11 +1591,28 @@ char *check_for_hostspec(char *s, char *
+@@ -1613,11 +1657,28 @@ char *check_for_hostspec(char *s, char *
{
char *p;
int not_host;
if ((p = strchr(s, '/')) != NULL) {
hostlen = p - s;
path = p + 1;
---- orig/rsync.h 2005-08-17 06:45:08
+--- orig/rsync.h 2005-10-14 18:45:50
+++ rsync.h 2004-10-08 21:01:33
@@ -32,6 +32,7 @@
#define BACKUP_SUFFIX "~"
-@@ -410,6 +411,11 @@ enum msgcode {
+@@ -415,6 +416,11 @@ enum msgcode {
# define SIZEOF_INT64 SIZEOF_OFF_T
#endif