Matt McCutchen's Web Site
/
rsync
/
rsync-patches.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated.
[rsync/rsync-patches.git]
/
fuzzy.diff
diff --git
a/fuzzy.diff
b/fuzzy.diff
index
bce2230
..
fa66efe
100644
(file)
--- a/
fuzzy.diff
+++ b/
fuzzy.diff
@@
-7,7
+7,7
@@
Very lightly tested.
Be sure to run "make proto" before "make".
--- orig/generator.c 2004-07-17 15:50:09
Be sure to run "make proto" before "make".
--- orig/generator.c 2004-07-17 15:50:09
-+++ generator.c 2004-07-
03 20:09:05
++++ generator.c 2004-07-
20 21:49:24
@@ -41,6 +41,7 @@ extern int ignore_times;
extern int size_only;
extern int io_timeout;
@@ -41,6 +41,7 @@ extern int ignore_times;
extern int size_only;
extern int io_timeout;
@@
-16,7
+16,7
@@
Be sure to run "make proto" before "make".
extern int always_checksum;
extern char *compare_dest;
extern int link_dest;
extern int always_checksum;
extern char *compare_dest;
extern int link_dest;
-@@ -24
1,6 +242,94 @@ static void generate_and_send_sums(struc
+@@ -24
8,6 +249,94 @@ static void generate_and_send_sums(int f
}
}
@@
-111,16
+111,16
@@
Be sure to run "make proto" before "make".
/*
* Acts on file number @p i from @p flist, whose name is @p fname.
/*
* Acts on file number @p i from @p flist, whose name is @p fname.
-@@ -256,7 +345,7 @@ static void recv_generator(char *fname,
+@@ -262,7 +351,7 @@ static void recv_generator(char *fname,
+ {
int fd = -1;
STRUCT_STAT st;
int fd = -1;
STRUCT_STAT st;
- struct map_struct *mapbuf = NULL;
- int statret;
+ int statret, fuzzy_file = 0;
char *fnamecmp;
char fnamecmpbuf[MAXPATHLEN];
- int statret;
+ int statret, fuzzy_file = 0;
char *fnamecmp;
char fnamecmpbuf[MAXPATHLEN];
-@@ -4
36,6 +525
,14 @@ static void recv_generator(char *fname,
+@@ -4
42,6 +531
,14 @@ static void recv_generator(char *fname,
} else
*fnamecmpbuf = '\0';
} else
*fnamecmpbuf = '\0';
@@
-135,7
+135,7
@@
Be sure to run "make proto" before "make".
if (statret == -1) {
if (preserve_hard_links && hard_link_check(file, HL_SKIP))
return;
if (statret == -1) {
if (preserve_hard_links && hard_link_check(file, HL_SKIP))
return;
-@@ -47
3,7 +570
,7 @@ static void recv_generator(char *fname,
+@@ -47
9,7 +576
,7 @@ static void recv_generator(char *fname,
return;
}
return;
}
@@
-163,7
+163,7
@@
Be sure to run "make proto" before "make".
if (preserve_hard_links)
init_hard_links(flist);
if (preserve_hard_links)
init_hard_links(flist);
---- orig/options.c 2004-07-
16 20:07:22
+--- orig/options.c 2004-07-
20 21:36:07
+++ options.c 2004-07-16 20:14:12
@@ -85,6 +85,7 @@ int safe_symlinks = 0;
int copy_unsafe_links = 0;
+++ options.c 2004-07-16 20:14:12
@@ -85,6 +85,7 @@ int safe_symlinks = 0;
int copy_unsafe_links = 0;
@@
-199,7
+199,7
@@
Be sure to run "make proto" before "make".
*argc = ac;
return;
*argc = ac;
return;
---- orig/receiver.c 2004-07-1
7 21:27:55
+--- orig/receiver.c 2004-07-1
9 16:44:39
+++ receiver.c 2004-07-03 20:09:05
@@ -37,7 +37,6 @@ extern int preserve_perms;
extern int cvs_exclude;
+++ receiver.c 2004-07-03 20:09:05
@@ -37,7 +37,6 @@ extern int preserve_perms;
extern int cvs_exclude;
@@
-209,7
+209,7
@@
Be sure to run "make proto" before "make".
extern int make_backups;
extern int do_progress;
extern char *backup_dir;
extern int make_backups;
extern int do_progress;
extern char *backup_dir;
---- orig/rsync.yo 2004-07-
19 08:27:29
+--- orig/rsync.yo 2004-07-
20 21:36:08
+++ rsync.yo 2004-07-03 19:27:25
@@ -326,6 +326,7 @@ verb(
-T --temp-dir=DIR create temporary files in directory DIR
+++ rsync.yo 2004-07-03 19:27:25
@@ -326,6 +326,7 @@ verb(
-T --temp-dir=DIR create temporary files in directory DIR