rt/mergerfs
1
0
Fork 0
mirror of https://github.com/trapexit/mergerfs.git synced 2026-10-26 19:01:56 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixup listxattr error handling

Browse source
This commit is contained in:
Antonio SJ Musumeci 2026-03-15 23:39:24 -05:00 • committed by trapexit
parent 9d1a4696e9
commit 21ce889449
1 changed files with 28 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/fuse_listxattr.cpp
View file

@ -26,7 +26,6 @@
#include "fuse.h"
#include <filesystem>
#include <optional>
#include <string>
#include <cstring>
@ -37,12 +36,16 @@ _listxattr_size(const std::vector<Branch*> &branches_,
const fs::path &fusepath_)
{
ssize_t size;
ssize_t err;
bool success;
fs::path fullpath;
if(branches_.empty())
return -ENOENT;
size = 0;
size = 0;
err = -ENOENT;
success = false;
for(const auto branch : branches_)
{
ssize_t rv;
@ -51,11 +54,19 @@ _listxattr_size(const std::vector<Branch*> &branches_,
rv = fs::llistxattr(fullpath,NULL,0);
if(rv < 0)
continue;
{
if(err == -ENOENT)
err = rv;
continue;
}
success = true;
size += rv;
}
if(success == false)
return err;
return size;
}
@ -68,36 +79,41 @@ _listxattr(const std::vector<Branch*> &branches_,
{
ssize_t rv;
ssize_t size;
ssize_t err;
bool success;
fs::path fullpath;
std::optional<ssize_t> err;
if(size_ == 0)
return ::_listxattr_size(branches_,fusepath_);
size = 0;
err = -ENOENT;
size = 0;
err = -ENOENT;
success = false;
for(const auto branch : branches_)
{
fullpath = branch->path / fusepath_;
rv = fs::llistxattr(fullpath,list_,size_);
if(rv == -ERANGE)
return -ERANGE;
if(rv < 0)
{
if(!err.has_value())
if(rv == -ERANGE)
return -ERANGE;
if(err == -ENOENT)
err = rv;
continue;
}
err = 0;
if((size_t)rv > size_)
return -ERANGE;
success = true;
list_ += rv;
size_ -= rv;
size += rv;
}
if(err < 0)
return err.value();
if(success == false)
return err;
return size;
}