Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make some RERR_* choices better, and another noop_io_until_death() tweak.
[rsync/rsync.git]
/
lib
/
sysxattrs.c
diff --git
a/lib/sysxattrs.c
b/lib/sysxattrs.c
index
40619e3
..
d55ee0c
100644
(file)
--- a/
lib/sysxattrs.c
+++ b/
lib/sysxattrs.c
@@
-133,20
+133,20
@@
static ssize_t read_xattr(int attrfd, void *buf, size_t buflen)
STRUCT_STAT sb;
ssize_t ret;
STRUCT_STAT sb;
ssize_t ret;
- if (fstat(fd, &sb) < 0)
+ if (fstat(
attr
fd, &sb) < 0)
ret = -1;
else if (sb.st_size > SSIZE_MAX) {
errno = ERANGE;
ret = -1;
ret = -1;
else if (sb.st_size > SSIZE_MAX) {
errno = ERANGE;
ret = -1;
- } else if (
size
== 0)
+ } else if (
buflen
== 0)
ret = sb.st_size;
ret = sb.st_size;
- else if (sb.st_size >
size
) {
+ else if (sb.st_size >
buflen
) {
errno = ERANGE;
ret = -1;
} else {
size_t bufpos;
errno = ERANGE;
ret = -1;
} else {
size_t bufpos;
- for (bufpos = 0; bufpos <
buflen
; ) {
- ssize_t cnt = read(attrfd, buf + bufpos,
buflen
- bufpos);
+ for (bufpos = 0; bufpos <
sb.st_size
; ) {
+ ssize_t cnt = read(attrfd, buf + bufpos,
sb.st_size
- bufpos);
if (cnt <= 0) {
if (cnt < 0 && errno == EINTR)
continue;
if (cnt <= 0) {
if (cnt < 0 && errno == EINTR)
continue;
@@
-193,7
+193,7
@@
int sys_lsetxattr(const char *path, const char *name, const void *value, size_t
size_t bufpos;
mode_t mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP;
size_t bufpos;
mode_t mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP;
- if ((attrfd = attropen(path, name, O_CREAT|O_
WRONLY|O_NOFOLLOW
, mode)) < 0)
+ if ((attrfd = attropen(path, name, O_CREAT|O_
TRUNC|O_WRONLY
, mode)) < 0)
return -1;
for (bufpos = 0; bufpos < size; ) {
return -1;
for (bufpos = 0; bufpos < size; ) {
@@
-217,7
+217,7
@@
int sys_lremovexattr(const char *path, const char *name)
int attrdirfd;
int ret;
int attrdirfd;
int ret;
- if ((attrdirfd = attropen(path, ".", O_RD
WR
)) < 0)
+ if ((attrdirfd = attropen(path, ".", O_RD
ONLY
)) < 0)
return -1;
ret = unlinkat(attrdirfd, name, 0);
return -1;
ret = unlinkat(attrdirfd, name, 0);
@@
-254,6
+254,8
@@
ssize_t sys_llistxattr(const char *path, char *list, size_t size)
continue;
if ((ret += len+1) > size) {
continue;
if ((ret += len+1) > size) {
+ if (size == 0)
+ continue;
ret = -1;
errno = ERANGE;
break;
ret = -1;
errno = ERANGE;
break;