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:
9a70b74
)
Fixed some patch fuzz.
author
Wayne Davison
<wayned@samba.org>
Fri, 10 Nov 2006 20:41:43 +0000
(20:41 +0000)
committer
Wayne Davison
<wayned@samba.org>
Fri, 10 Nov 2006 20:41:43 +0000
(20:41 +0000)
flags.diff
patch
|
blob
|
blame
|
history
diff --git
a/flags.diff
b/flags.diff
index
8f45daf
..
cea538a
100644
(file)
--- a/
flags.diff
+++ b/
flags.diff
@@
-179,16
+179,16
@@
To use this patch, run these commands for a successful build:
}
}
}
}
-@@ -978,7 +994,7 @@ static void recv_generator(char *fname,
+@@ -977,7 +993,7 @@ static void recv_generator(char *fname,
+ * we need to delete it. If it doesn't exist, then
* (perhaps recursively) create it. */
* (perhaps recursively) create it. */
- int sr;
if (statret == 0 && !S_ISDIR(st.st_mode)) {
- if (delete_item(fname, st.st_mode, del_opts) < 0)
+ if (delete_item(fname, st.st_mode, FILEFLAGS(st.st_flags), del_opts) < 0)
return;
statret = -1;
}
if (statret == 0 && !S_ISDIR(st.st_mode)) {
- if (delete_item(fname, st.st_mode, del_opts) < 0)
+ if (delete_item(fname, st.st_mode, FILEFLAGS(st.st_flags), del_opts) < 0)
return;
statret = -1;
}
-@@ -10
69,7 +1085
,7 @@ static void recv_generator(char *fname,
+@@ -10
71,7 +1087
,7 @@ static void recv_generator(char *fname,
}
/* Not the right symlink (or not a symlink), so
* delete it. */
}
/* Not the right symlink (or not a symlink), so
* delete it. */
@@
-197,7
+197,7
@@
To use this patch, run these commands for a successful build:
return;
} else if (basis_dir[0] != NULL) {
int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st,
return;
} else if (basis_dir[0] != NULL) {
int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st,
-@@ -113
2,7 +1148
,7 @@ static void recv_generator(char *fname,
+@@ -113
4,7 +1150
,7 @@ static void recv_generator(char *fname,
goto return_with_success;
return;
}
goto return_with_success;
return;
}
@@
-206,7
+206,7
@@
To use this patch, run these commands for a successful build:
return;
} else if (basis_dir[0] != NULL) {
int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st,
return;
} else if (basis_dir[0] != NULL) {
int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st,
-@@ -12
18,7 +1234
,7 @@ static void recv_generator(char *fname,
+@@ -12
20,7 +1236
,7 @@ static void recv_generator(char *fname,
fnamecmp_type = FNAMECMP_FNAME;
if (statret == 0 && !S_ISREG(st.st_mode)) {
fnamecmp_type = FNAMECMP_FNAME;
if (statret == 0 && !S_ISREG(st.st_mode)) {