extern int always_checksum;
extern char *compare_dest;
extern int link_dest;
-@@ -238,6 +239,94 @@ static void generate_and_send_sums(struc
+@@ -241,6 +242,94 @@ static void generate_and_send_sums(struc
}
/*
* Acts on file number @p i from @p flist, whose name is @p fname.
-@@ -253,7 +342,7 @@ static void recv_generator(char *fname,
+@@ -256,7 +345,7 @@ static void recv_generator(char *fname,
int fd;
STRUCT_STAT st;
struct map_struct *mapbuf;
char *fnamecmp;
char fnamecmpbuf[MAXPATHLEN];
-@@ -436,6 +525,14 @@ static void recv_generator(char *fname,
+@@ -439,6 +528,14 @@ static void recv_generator(char *fname,
} else
*fnamecmpbuf = '\0';
if (statret == -1) {
if (preserve_hard_links && hard_link_check(file, HL_SKIP))
return;
-@@ -482,7 +579,7 @@ static void recv_generator(char *fname,
+@@ -485,7 +582,7 @@ static void recv_generator(char *fname,
return;
}
if (!*fnamecmpbuf)
set_perms(fname, file, &st, PERMS_REPORT);
return;
---- orig/options.c 2004-07-15 16:51:50
-+++ options.c 2004-07-03 19:27:25
-@@ -94,6 +94,7 @@ int ignore_errors = 0;
- int modify_window = 0;
- int blocking_io = -1;
- int checksum_seed = 0;
+--- orig/options.c 2004-07-16 20:07:22
++++ options.c 2004-07-16 20:14:12
+@@ -85,6 +85,7 @@ int safe_symlinks = 0;
+ int copy_unsafe_links = 0;
+ int size_only = 0;
+ int bwlimit = 0;
+int fuzzy = 0;
- unsigned int block_size = 0;
-
-
-@@ -269,6 +270,7 @@ void usage(enum logcode F)
+ size_t bwlimit_writemax = 0;
+ int delete_after = 0;
+ int only_existing = 0;
+@@ -276,6 +277,7 @@ void usage(enum logcode F)
rprintf(F," -T --temp-dir=DIR create temporary files in directory DIR\n");
rprintf(F," --compare-dest=DIR also compare destination files relative to DIR\n");
rprintf(F," --link-dest=DIR create hardlinks to DIR for unchanged files\n");
rprintf(F," -P equivalent to --partial --progress\n");
rprintf(F," -z, --compress compress file data\n");
rprintf(F," -C, --cvs-exclude auto ignore files in the same way CVS does\n");
-@@ -367,6 +369,7 @@ static struct poptOption long_options[]
+@@ -375,6 +377,7 @@ static struct poptOption long_options[]
{"temp-dir", 'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 },
{"compare-dest", 0, POPT_ARG_STRING, &compare_dest, 0, 0, 0 },
{"link-dest", 0, POPT_ARG_STRING, &compare_dest, OPT_LINK_DEST, 0, 0 },
/* TODO: Should this take an optional int giving the compression level? */
{"compress", 'z', POPT_ARG_NONE, &do_compression, 0, 0, 0 },
{"daemon", 0, POPT_ARG_NONE, &daemon_opt, 0, 0, 0 },
-@@ -981,6 +984,9 @@ void server_options(char **args,int *arg
+@@ -1019,6 +1022,9 @@ void server_options(char **args,int *arg
}
}
extern int make_backups;
extern int do_progress;
extern char *backup_dir;
---- orig/rsync.yo 2004-07-15 02:21:11
+--- orig/rsync.yo 2004-07-16 20:07:23
+++ rsync.yo 2004-07-03 19:27:25
-@@ -325,6 +325,7 @@ verb(
+@@ -326,6 +326,7 @@ verb(
-T --temp-dir=DIR create temporary files in directory DIR
--compare-dest=DIR also compare received files relative to DIR
--link-dest=DIR create hardlinks to DIR for unchanged files