Matt McCutchen's Web Site
/
rsync
/
rsync-patches.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4983956
)
Fixed a failing hunk.
author
Wayne Davison
<wayned@samba.org>
Sat, 15 Jan 2005 21:36:05 +0000
(21:36 +0000)
committer
Wayne Davison
<wayned@samba.org>
Sat, 15 Jan 2005 21:36:05 +0000
(21:36 +0000)
fuzzy.diff
patch
|
blob
|
blame
|
history
diff --git
a/fuzzy.diff
b/fuzzy.diff
index
82ee022
..
47e28a9
100644
(file)
--- a/
fuzzy.diff
+++ b/
fuzzy.diff
@@
-4,8
+4,8
@@
Lightly tested.
Be sure to run "make proto" before "make".
Be sure to run "make proto" before "make".
---- orig/generator.c 2005-01-1
4 18:30:18
-+++ generator.c 200
4-11-27 18:12:57
+--- orig/generator.c 2005-01-1
5 21:18:09
++++ generator.c 200
5-01-15 21:20:10
@@ -44,6 +44,7 @@ extern int size_only;
extern OFF_T max_size;
extern int io_timeout;
@@ -44,6 +44,7 @@ extern int size_only;
extern OFF_T max_size;
extern int io_timeout;
@@
-123,7
+123,7
@@
Be sure to run "make proto" before "make".
return;
@@ -521,6 +615,8 @@ static void recv_generator(char *fname,
return;
@@ -521,6 +615,8 @@ static void recv_generator(char *fname,
- if (
(link_dest || copy_dest) && fnamecmp_type != FNAMECMP_FNAME
)
+ if (
!compare_dest && fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH
)
;
+ else if (fnamecmp_type == FNAMECMP_FUZZY)
+ ;
;
+ else if (fnamecmp_type == FNAMECMP_FUZZY)
+ ;
@@
-176,8
+176,8
@@
Be sure to run "make proto" before "make".
/* The receiving side mustn't obey this, or an existing symlink that
* points to an identical file won't be replaced by the referent. */
/* The receiving side mustn't obey this, or an existing symlink that
* points to an identical file won't be replaced by the referent. */
---- orig/options.c 2005-01-15 2
0:26:21
-+++ options.c 200
4-11-29 01:36:48
+--- orig/options.c 2005-01-15 2
1:23:15
++++ options.c 200
5-01-15 21:08:13
@@ -86,6 +86,7 @@ int copy_unsafe_links = 0;
int size_only = 0;
int daemon_bwlimit = 0;
@@ -86,6 +86,7 @@ int copy_unsafe_links = 0;
int size_only = 0;
int daemon_bwlimit = 0;
@@
-225,9
+225,9
@@
Be sure to run "make proto" before "make".
*argc = ac;
return;
*argc = ac;
return;
---- orig/receiver.c 2005-01-1
0 09:46:01
-+++ receiver.c 200
4-11-27 18:15:01
-@@ -32
3,6 +323
,27 @@ static int receive_data(int f_in, char *
+--- orig/receiver.c 2005-01-1
5 21:18:09
++++ receiver.c 200
5-01-15 21:21:02
+@@ -32
4,6 +324
,27 @@ static int receive_data(int f_in, char *
}
}
@@
-255,7
+255,7
@@
Be sure to run "make proto" before "make".
static void discard_receive_data(int f_in, OFF_T length)
{
receive_data(f_in, NULL, -1, 0, NULL, -1, length);
static void discard_receive_data(int f_in, OFF_T length)
{
receive_data(f_in, NULL, -1, 0, NULL, -1, length);
-@@ -45
3,6 +474
,10 @@ int recv_files(int f_in, struct file_lis
+@@ -45
4,6 +475
,10 @@ int recv_files(int f_in, struct file_lis
case FNAMECMP_BACKUP:
fnamecmp = get_backup_name(fname);
break;
case FNAMECMP_BACKUP:
fnamecmp = get_backup_name(fname);
break;
@@
-263,12
+263,12
@@
Be sure to run "make proto" before "make".
+ read_gen_name(f_in_name, fnamecmpbuf);
+ fnamecmp = fnamecmpbuf;
+ break;
+ read_gen_name(f_in_name, fnamecmpbuf);
+ fnamecmp = fnamecmpbuf;
+ break;
- case FNAMECMP_BASIS_DIR:
default:
default:
- pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
---- orig/rsync.h 2005-01-10 00:21:12
-+++ rsync.h 2004-11-03 22:53:09
-@@ -125,6 +125,7 @@
+ if (j >= basis_dir_cnt) {
+ rprintf(FERROR,
+--- orig/rsync.h 2005-01-15 21:18:09
++++ rsync.h 2005-01-15 21:24:09
+@@ -127,6 +127,7 @@
#define FNAMECMP_FNAME 0x80
#define FNAMECMP_PARTIAL_DIR 0x81
#define FNAMECMP_BACKUP 0x82
#define FNAMECMP_FNAME 0x80
#define FNAMECMP_PARTIAL_DIR 0x81
#define FNAMECMP_BACKUP 0x82