github-mirror/mergerfs
github-mirror/mergerfs
2
0
Fork 0
mirror of https://github.com/trapexit/mergerfs.git synced 2025-02-22 08:29:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #256 from trapexit/xattr

Browse Source 
properly check errors of xattr. closes #255
This commit is contained in:
Antonio SJ Musumeci 2016-03-10 18:38:05 -05:00
commit 93acfb015c
1 changed files with 47 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
src/fs_xattr.cpp
View File

@ -44,23 +44,23 @@ namespace fs
{ {
#ifndef WITHOUT_XATTR #ifndef WITHOUT_XATTR
ssize_t rv; ssize_t rv;
ssize_t size;
rv = -1; rv = -1;
errno = ERANGE; errno = ERANGE;
while(rv == -1 && errno == ERANGE) while((rv == -1) && (errno == ERANGE))
{ {
size = ::flistxattr(fd,NULL,0); rv = ::flistxattr(fd,NULL,0);
attrs.resize(size); if(rv <= 0)
if(size == 0) return rv;
return 0;
rv = ::flistxattr(fd,&attrs[0],size); attrs.resize(rv);
rv = ::flistxattr(fd,&attrs[0],rv);
} }
return rv; return rv;
#else #else
errno = ENOTSUP; return (errno=ENOTSUP,-1);
return -1;
#endif #endif
} }
@ -69,24 +69,24 @@ namespace fs
vector<char> &attrs) vector<char> &attrs)
{ {
#ifndef WITHOUT_XATTR #ifndef WITHOUT_XATTR
int rv; ssize_t rv;
int size;
rv = -1; rv = -1;
errno = ERANGE; errno = ERANGE;
while(rv == -1 && errno == ERANGE) while((rv == -1) && (errno == ERANGE))
{ {
size = ::listxattr(path.c_str(),NULL,0); rv = ::llistxattr(path.c_str(),NULL,0);
attrs.resize(size); if(rv <= 0)
if(size == 0) return rv;
return 0;
rv = ::listxattr(path.c_str(),&attrs[0],size); attrs.resize(rv);
rv = ::llistxattr(path.c_str(),&attrs[0],rv);
} }
return rv; return rv;
#else #else
errno = ENOTSUP; return (errno=ENOTSUP,-1);
return -1;
#endif #endif
} }
@ -126,7 +126,7 @@ namespace fs
int int
list(const int fd, list(const int fd,
string &attrstr) string &attrstr)
{ {
int rv; int rv;
vector<char> attrs; vector<char> attrs;
@ -158,24 +158,24 @@ namespace fs
vector<char> &value) vector<char> &value)
{ {
#ifndef WITHOUT_XATTR #ifndef WITHOUT_XATTR
int rv; ssize_t rv;
int size;
rv = -1; rv = -1;
errno = ERANGE; errno = ERANGE;
while(rv == -1 && errno == ERANGE) while((rv == -1) && (errno == ERANGE))
{ {
size = ::fgetxattr(fd,attr.c_str(),NULL,0); rv = ::fgetxattr(fd,attr.c_str(),NULL,0);
value.resize(size); if(rv <= 0)
if(size == 0) return rv;
return 0;
rv = ::fgetxattr(fd,attr.c_str(),&value[0],size); value.resize(rv);
rv = ::fgetxattr(fd,attr.c_str(),&value[0],rv);
} }
return rv; return rv;
#else #else
errno = ENOTSUP; return (errno=ENOTSUP,-1);
return -1;
#endif #endif
} }
@ -185,24 +185,24 @@ namespace fs
vector<char> &value) vector<char> &value)
{ {
#ifndef WITHOUT_XATTR #ifndef WITHOUT_XATTR
int rv; ssize_t rv;
int size;
rv = -1; rv = -1;
errno = ERANGE; errno = ERANGE;
while(rv == -1 && errno == ERANGE) while((rv == -1) && (errno == ERANGE))
{ {
size = ::getxattr(path.c_str(),attr.c_str(),NULL,0); rv = ::lgetxattr(path.c_str(),attr.c_str(),NULL,0);
value.resize(size); if(rv <= 0)
if(size == 0) return rv;
return 0;
rv = ::getxattr(path.c_str(),attr.c_str(),&value[0],size); value.resize(rv);
rv = ::lgetxattr(path.c_str(),attr.c_str(),&value[0],rv);
} }
return rv; return rv;
#else #else
errno = ENOTSUP; return (errno=ENOTSUP,-1);
return -1;
#endif #endif
} }
@ -305,8 +305,7 @@ namespace fs
value.size(), value.size(),
flags); flags);
#else #else
errno = ENOTSUP; return (errno=ENOTSUP,-1);
return -1;
#endif #endif
} }
@ -317,14 +316,13 @@ namespace fs
const int flags) const int flags)
{ {
#ifndef WITHOUT_XATTR #ifndef WITHOUT_XATTR
return ::setxattr(path.c_str(), return ::lsetxattr(path.c_str(),
key.c_str(), key.c_str(),
value.data(), value.data(),
value.size(), value.size(),
flags); flags);
#else #else
errno = ENOTSUP; return (errno=ENOTSUP,-1);
return -1;
#endif #endif
} }