|
|
|
|
@ -1,28 +1,31 @@
|
|
|
|
|
--- main.c Tue Jan 28 06:05:53 2003
|
|
|
|
|
+++ main.c Tue Jan 28 10:00:40 2003
|
|
|
|
|
@@ -208,7 +208,7 @@
|
|
|
|
|
Index: main.c
|
|
|
|
|
--- main.c.orig 2003-12-20 17:57:24.000000000 +0100
|
|
|
|
|
+++ main.c 2004-01-01 20:12:53.000000000 +0100
|
|
|
|
|
@@ -209,7 +209,7 @@
|
|
|
|
|
if (!cmd)
|
|
|
|
|
cmd = getenv(RSYNC_RSH_ENV);
|
|
|
|
|
cmd = rsh_env;
|
|
|
|
|
if (!cmd)
|
|
|
|
|
- cmd = RSYNC_RSH;
|
|
|
|
|
+ cmd = RSYNC_SSH;
|
|
|
|
|
cmd = strdup(cmd);
|
|
|
|
|
if (!cmd)
|
|
|
|
|
if (!cmd)
|
|
|
|
|
goto oom;
|
|
|
|
|
--- options.c Tue Jan 28 04:11:57 2003
|
|
|
|
|
+++ options.c Tue Jan 28 10:01:13 2003
|
|
|
|
|
@@ -230,7 +230,7 @@
|
|
|
|
|
Index: options.c
|
|
|
|
|
--- options.c.orig 2003-12-30 19:16:25.000000000 +0100
|
|
|
|
|
+++ options.c 2004-01-01 20:14:14.000000000 +0100
|
|
|
|
|
@@ -238,7 +238,7 @@
|
|
|
|
|
rprintf(F," --no-whole-file turn off --whole-file\n");
|
|
|
|
|
rprintf(F," -x, --one-file-system don't cross filesystem boundaries\n");
|
|
|
|
|
rprintf(F," -B, --block-size=SIZE checksum blocking size (default %d)\n",BLOCK_SIZE);
|
|
|
|
|
rprintf(F," -B, --block-size=SIZE checksum blocking size (default %d)\n",BLOCK_SIZE);
|
|
|
|
|
- rprintf(F," -e, --rsh=COMMAND specify the remote shell\n");
|
|
|
|
|
+ rprintf(F," -e, --rsh=COMMAND specify rsh replacement (default %s)\n", RSYNC_SSH);
|
|
|
|
|
rprintf(F," --rsync-path=PATH specify path to rsync on the remote machine\n");
|
|
|
|
|
rprintf(F," -C, --cvs-exclude auto ignore files in the same way CVS does\n");
|
|
|
|
|
rprintf(F," --existing only update files that already exist\n");
|
|
|
|
|
--- rsync.h Sun Jan 26 21:11:16 2003
|
|
|
|
|
+++ rsync.h Tue Jan 28 10:00:40 2003
|
|
|
|
|
@@ -101,6 +101,7 @@
|
|
|
|
|
rprintf(F," --ignore-existing ignore files that already exist on receiving side\n");
|
|
|
|
|
Index: rsync.h
|
|
|
|
|
--- rsync.h.orig 2003-12-17 00:04:59.000000000 +0100
|
|
|
|
|
+++ rsync.h 2004-01-01 20:12:53.000000000 +0100
|
|
|
|
|
@@ -121,6 +121,7 @@
|
|
|
|
|
#ifdef HAVE_SYS_PARAM_H
|
|
|
|
|
#include <sys/param.h>
|
|
|
|
|
#endif
|
|
|
|
|
@ -30,28 +33,9 @@
|
|
|
|
|
|
|
|
|
|
#ifdef HAVE_STDLIB_H
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
@@ -114,7 +115,7 @@
|
|
|
|
|
#include <string.h>
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
-#ifdef HAVE_MALLOC_H
|
|
|
|
|
+#if defined(HAVE_MALLINFO) && defined(HAVE_MALLOC_H)
|
|
|
|
|
#include <malloc.h>
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
@@ -182,10 +183,6 @@
|
|
|
|
|
|
|
|
|
|
#ifdef HAVE_GLOB_H
|
|
|
|
|
#include <glob.h>
|
|
|
|
|
-#endif
|
|
|
|
|
-
|
|
|
|
|
-#ifdef HAVE_MALLOC_H
|
|
|
|
|
-# include <malloc.h>
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* these are needed for the uid/gid mapping code */
|
|
|
|
|
--- zlib/infcodes.c Tue Mar 12 02:14:58 2002
|
|
|
|
|
+++ zlib/infcodes.c Tue Jan 28 10:00:40 2003
|
|
|
|
|
Index: zlib/infcodes.c
|
|
|
|
|
--- zlib/infcodes.c.orig 2002-03-12 02:14:58.000000000 +0100
|
|
|
|
|
+++ zlib/infcodes.c 2004-01-01 20:12:53.000000000 +0100
|
|
|
|
|
@@ -197,8 +197,18 @@
|
|
|
|
|
c->mode = COPY;
|
|
|
|
|
case COPY: /* o: copying bytes in window, waiting for space */
|
|
|
|
|
|
