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:
742a410
)
Fixed to work with the latest xattr.diff.
author
Wayne Davison
<wayned@samba.org>
Thu, 2 Nov 2006 00:40:11 +0000
(
00:40
+0000)
committer
Wayne Davison
<wayned@samba.org>
Thu, 2 Nov 2006 00:40:11 +0000
(
00:40
+0000)
fake-super.diff
patch
|
blob
|
blame
|
history
diff --git
a/fake-super.diff
b/fake-super.diff
index
0f45051
..
e8a078a
100644
(file)
--- a/
fake-super.diff
+++ b/
fake-super.diff
@@
-449,7
+449,7
@@
above:
typedef struct {
char *name;
char *datum;
typedef struct {
char *name;
char *datum;
-@@ -13
2,9 +135
,15 @@ static int rsync_xal_get(const char *fna
+@@ -13
4,9 +137
,15 @@ static int rsync_xal_get(const char *fna
if (name_size == 0)
return 0;
for (left = name_size, name = namebuf; left > 0 ; left -= len, name += len) {
if (name_size == 0)
return 0;
for (left = name_size, name = namebuf; left > 0 ; left -= len, name += len) {
@@
-466,7
+466,7
@@
above:
datum_size = sys_lgetxattr(fname, name, NULL, 0);
if (datum_size < 0) {
if (errno == ENOTSUP)
datum_size = sys_lgetxattr(fname, name, NULL, 0);
if (datum_size < 0) {
if (errno == ENOTSUP)
-@@ -28
7,10 +296,19
@@ void receive_xattr(struct file_struct *f
+@@ -28
8,6 +297,14
@@ void receive_xattr(struct file_struct *f
out_of_memory("receive_xattr");
read_buf(f, ptr, name_len);
read_buf(f, ptr + name_len, datum_len);
out_of_memory("receive_xattr");
read_buf(f, ptr, name_len);
read_buf(f, ptr + name_len, datum_len);
@@
-481,12
+481,7
@@
above:
rxa->name_len = name_len;
rxa->datum_len = datum_len;
rxa->name = ptr;
rxa->name_len = name_len;
rxa->datum_len = datum_len;
rxa->name = ptr;
- rxa->datum = ptr + name_len;
-+
- #ifdef HAVE_OSX_XATTRS
- if (strncmp(rxa->name, UNIQUE_PREFIX, UPRE_LEN) == 0) {
- rxa->name_len -= UPRE_LEN;
-@@ -372,4 +390,146 @@ int set_xattr(const char *fname, const s
+@@ -373,4 +390,146 @@ int set_xattr(const char *fname, const s
return rsync_xal_set(fname, lst + ndx); /* TODO: This needs to return 1 if no xattrs changed! */
}
return rsync_xal_set(fname, lst + ndx); /* TODO: This needs to return 1 if no xattrs changed! */
}
@@
-595,7
+590,7
@@
above:
+ to_wire_mode(file->mode) & (_S_IFMT|CHMOD_BITS),
+ (int)major(rdev), (int)minor(rdev),
+ (int)file->uid, (int)file->gid);
+ to_wire_mode(file->mode) & (_S_IFMT|CHMOD_BITS),
+ (int)major(rdev), (int)minor(rdev),
+ (int)file->uid, (int)file->gid);
-+ if (sys_lsetxattr(fname, FAKE_XATTR, buf, len
, 0
) < 0) {
++ if (sys_lsetxattr(fname, FAKE_XATTR, buf, len) < 0) {
+ if (errno == EPERM && S_ISLNK(fst.st_mode))
+ return 0;
+ rsyserr(FERROR, errno,
+ if (errno == EPERM && S_ISLNK(fst.st_mode))
+ return 0;
+ rsyserr(FERROR, errno,