if (verbose > 3) {
rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): entered\n",
code, safe_fname(file), line);
---- orig/clientserver.c 2005-02-07 20:41:56
+--- orig/clientserver.c 2005-02-14 02:45:10
+++ clientserver.c 2004-10-08 20:44:59
@@ -45,6 +45,9 @@ extern int select_timeout;
extern int orig_umask;
AC_MSG_CHECKING([whether to call shutdown on all sockets])
case $host_os in
*cygwin* ) AC_MSG_RESULT(yes)
---- orig/main.c 2005-02-07 20:41:56
+--- orig/main.c 2005-02-14 02:45:10
+++ main.c 2004-10-08 20:15:28
-@@ -52,6 +52,9 @@ extern int write_batch;
+@@ -53,6 +53,9 @@ extern int write_batch;
extern int batch_fd;
extern int batch_gen_fd;
extern int filesfrom_fd;
extern pid_t cleanup_child_pid;
extern char *files_from;
extern char *remote_filesfrom_file;
-@@ -821,33 +824,48 @@ static int start_client(int argc, char *
+@@ -823,33 +826,48 @@ static int start_client(int argc, char *
if ((rc = copy_argv(argv)))
return rc;
p = find_colon(argv[0]);
if (p) { /* source is remote */
if (remote_filesfrom_file
-@@ -879,12 +897,26 @@ static int start_client(int argc, char *
+@@ -881,12 +899,26 @@ static int start_client(int argc, char *
argv++;
} else { /* source is local */
am_sender = 1;
p = strchr(host,'/');
if (p) {
*p = '\0';
---- orig/options.c 2005-02-11 18:21:45
+--- orig/options.c 2005-02-14 02:45:10
+++ options.c 2004-11-27 18:31:46
-@@ -143,6 +143,14 @@ int quiet = 0;
+@@ -144,6 +144,14 @@ int quiet = 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;
-@@ -168,6 +176,7 @@ static void print_rsync_version(enum log
+@@ -169,6 +177,7 @@ static void print_rsync_version(enum log
char const *hardlinks = "no ";
char const *links = "no ";
char const *ipv6 = "no ";
+ char const *ssl = "no ";
STRUCT_STAT *dumstat;
- #if HAVE_SOCKETPAIR
-@@ -190,6 +199,10 @@ static void print_rsync_version(enum log
+ #ifdef HAVE_SOCKETPAIR
+@@ -191,6 +200,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,
-@@ -203,10 +216,10 @@ static void print_rsync_version(enum log
+@@ -204,10 +217,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());
-@@ -333,6 +346,13 @@ void usage(enum logcode F)
+@@ -335,6 +348,13 @@ void usage(enum logcode F)
rprintf(F," -4, --ipv4 prefer IPv4\n");
rprintf(F," -6, --ipv6 prefer IPv6\n");
#endif
rprintf(F," -h, --help show this help screen\n");
rprintf(F,"\nUse \"rsync --daemon --help\" to see the daemon-mode command-line options.\n");
-@@ -343,7 +363,7 @@ void usage(enum logcode F)
+@@ -345,7 +365,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[] = {
-@@ -439,6 +459,13 @@ static struct poptOption long_options[]
+@@ -442,6 +462,13 @@ static struct poptOption long_options[]
{"ipv4", '4', POPT_ARG_VAL, &default_af_hint, AF_INET, 0, 0 },
{"ipv6", '6', POPT_ARG_VAL, &default_af_hint, AF_INET6, 0, 0 },
#endif
/* All these options switch us into daemon-mode option-parsing. */
{"address", 0, POPT_ARG_STRING, 0, OPT_DAEMON, 0, 0 },
{"config", 0, POPT_ARG_STRING, 0, OPT_DAEMON, 0, 0 },
-@@ -831,6 +858,12 @@ int parse_arguments(int *argc, const cha
+@@ -834,6 +861,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. */
-@@ -1063,6 +1096,17 @@ int parse_arguments(int *argc, const cha
+@@ -1066,6 +1099,17 @@ int parse_arguments(int *argc, const cha
if (delay_updates && !partial_dir)
partial_dir = partialdir_for_delayupdate;
+#endif
+
if (inplace) {
- #if HAVE_FTRUNCATE
+ #ifdef HAVE_FTRUNCATE
if (partial_dir) {
---- orig/rsync.h 2005-02-07 20:41:57
+--- orig/rsync.h 2005-02-14 02:45:10
+++ rsync.h 2004-10-08 21:01:33
@@ -32,6 +32,7 @@
#define BACKUP_SUFFIX "~"
-@@ -382,6 +383,11 @@ enum msgcode {
+@@ -384,6 +385,11 @@ enum msgcode {
# define SIZEOF_INT64 SIZEOF_OFF_T
#endif