+Depends-On-Patch: partial-dir.diff
Depends-On-Patch: g2r-basis-filename.diff
The changes to generator.c were greatly simplified, making the patch
Be sure to run "make proto" before "make".
---- orig/generator.c 2004-07-17 15:50:09
-+++ generator.c 2004-07-20 21:49:24
+--- orig/generator.c 2004-07-28 10:14:15
++++ generator.c 2004-07-28 10:23:12
@@ -41,6 +41,7 @@ extern int ignore_times;
extern int size_only;
extern int io_timeout;
extern int protocol_version;
+extern int fuzzy;
extern int always_checksum;
+ extern char *partial_dir;
extern char *compare_dest;
- extern int link_dest;
-@@ -248,6 +249,94 @@ static void generate_and_send_sums(int f
+@@ -249,6 +250,94 @@ static void generate_and_send_sums(int f
}
/*
* Acts on file number @p i from @p flist, whose name is @p fname.
-@@ -262,7 +351,7 @@ static void recv_generator(char *fname,
+@@ -263,7 +352,7 @@ static void recv_generator(char *fname,
{
int fd = -1;
STRUCT_STAT st;
-- int statret;
-+ int statret, fuzzy_file = 0;
+- int statret, stat_errno;
++ int statret, stat_errno, fuzzy_file = 0;
char *fnamecmp;
char fnamecmpbuf[MAXPATHLEN];
-@@ -442,6 +531,14 @@ static void recv_generator(char *fname,
+@@ -448,6 +537,14 @@ static void recv_generator(char *fname,
} else
*fnamecmpbuf = '\0';
+ fuzzy_file = 1;
+ }
+
- if (statret == -1) {
- if (preserve_hard_links && hard_link_check(file, HL_SKIP))
+ if (statret == 0 && !S_ISREG(st.st_mode)) {
+ if (delete_file(fname) != 0)
return;
-@@ -479,7 +576,7 @@ static void recv_generator(char *fname,
+@@ -481,7 +578,7 @@ static void recv_generator(char *fname,
return;
}
if (!*fnamecmpbuf)
set_perms(fname, file, &st, PERMS_REPORT);
return;
---- orig/main.c 2004-07-17 15:58:11
-+++ main.c 2004-07-17 16:32:39
+--- orig/main.c 2004-07-22 00:10:43
++++ main.c 2004-07-22 00:32:31
@@ -47,6 +47,7 @@ extern int keep_dirlinks;
extern int preserve_hard_links;
extern int protocol_version;
extern int relative_paths;
extern int rsync_port;
extern int whole_file;
-@@ -446,7 +447,7 @@ static int do_recv(int f_in,int f_out,st
+@@ -458,7 +459,7 @@ static int do_recv(int f_in,int f_out,st
int pid;
int status = 0;
int error_pipe[2], name_pipe[2];
-- int need_name_pipe = compare_dest || read_batch;
-+ int need_name_pipe = compare_dest || fuzzy || read_batch;
+- BOOL need_name_pipe = compare_dest && !dry_run;
++ BOOL need_name_pipe = (compare_dest || fuzzy) && !dry_run;
if (preserve_hard_links)
init_hard_links(flist);
---- orig/options.c 2004-07-20 21:36:07
+--- orig/options.c 2004-07-26 16:43:48
+++ options.c 2004-07-16 20:14:12
@@ -85,6 +85,7 @@ int safe_symlinks = 0;
int copy_unsafe_links = 0;
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");
+@@ -279,6 +280,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," --fuzzy use similar file as basis if basis doesn't exist\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");
-@@ -375,6 +377,7 @@ static struct poptOption long_options[]
+@@ -378,6 +380,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 },
-@@ -1019,6 +1022,9 @@ void server_options(char **args,int *arg
+@@ -1039,6 +1042,9 @@ void server_options(char **args,int *arg
}
}
*argc = ac;
return;
---- orig/receiver.c 2004-07-19 16:44:39
-+++ receiver.c 2004-07-03 20:09:05
-@@ -37,7 +37,6 @@ extern int preserve_perms;
- extern int cvs_exclude;
+--- orig/receiver.c 2004-07-23 21:59:07
++++ receiver.c 2004-07-23 22:08:03
+@@ -39,7 +39,6 @@ extern int cvs_exclude;
extern int io_error;
extern char *tmpdir;
+ extern char *partial_dir;
-extern char *compare_dest;
extern int make_backups;
extern int do_progress;
extern char *backup_dir;
---- orig/rsync.yo 2004-07-20 21:36:08
+--- orig/rsync.yo 2004-07-28 02:26:19
+++ rsync.yo 2004-07-03 19:27:25
-@@ -326,6 +326,7 @@ verb(
+@@ -327,6 +327,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
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff