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
Allow Solaris sys_llistxattr() to return the list length when size == 0.
[rsync/rsync.git]
/
lib
/
sysxattrs.c
diff --git
a/lib/sysxattrs.c
b/lib/sysxattrs.c
index
40619e3
..
1512518
100644
(file)
--- a/
lib/sysxattrs.c
+++ b/
lib/sysxattrs.c
@@
-133,14
+133,14
@@
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 {
errno = ERANGE;
ret = -1;
} else {
@@
-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;