octoleo/s3fs-fuse
1
0
Fork 0
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git synced 2025-03-16 14:32:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed wrong owner checking and return codes

Browse Source
This commit is contained in:
Takeshi Nakatani 2015-04-21 16:18:05 +00:00
parent f258a14070
commit aac92bd6c0
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/s3fs.cpp
View File

@ -2914,9 +2914,6 @@ static int s3fs_getxattr(const char* path, const char* name, char* value, size_t
if(0 != (result = check_parent_object_access(path, X_OK))){
return result;
}
if(0 != (result = check_object_owner(path, NULL))){
return result;
}
// get headders
if(0 != (result = get_object_attribute(path, NULL, &meta))){
@ -2966,9 +2963,6 @@ static int s3fs_listxattr(const char* path, char* list, size_t size)
if(0 != (result = check_parent_object_access(path, X_OK))){
return result;
}
if(0 != (result = check_object_owner(path, NULL))){
return result;
}
// get headders
if(0 != (result = get_object_attribute(path, NULL, &meta))){
@ -2978,7 +2972,7 @@ static int s3fs_listxattr(const char* path, char* list, size_t size)
// get xattrs
if(meta.end() == meta.find("x-amz-meta-xattr")){
// object does not have xattrs
return -ENOATTR;
return 0;
}
string strxattrs = urlDecode(meta["x-amz-meta-xattr"]);
parse_xattrs(strxattrs, xattrs);
@ -2986,7 +2980,12 @@ static int s3fs_listxattr(const char* path, char* list, size_t size)
// calculate total name length
size_t total = 0;
for(xattrs_t::const_iterator iter = xattrs.begin(); iter != xattrs.end(); ++iter){
total += iter->first.length() + 1;
if(0 < iter->first.length()){
total += iter->first.length() + 1;
}
}
if(0 == total){
return 0;
}
// check parameters
@ -3000,10 +2999,11 @@ static int s3fs_listxattr(const char* path, char* list, size_t size)
// copy to list
char* setpos = list;
for(xattrs_t::const_iterator iter = xattrs.begin(); iter != xattrs.end(); ++iter){
strcpy(setpos, iter->first.c_str());
setpos = &setpos[strlen(setpos) + 1];
if(0 < iter->first.length()){
strcpy(setpos, iter->first.c_str());
setpos = &setpos[strlen(setpos) + 1];
}
}
return total;
}