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

fix name length calculation for musc

Browse Source
This commit is contained in:
Antonio SJ Musumeci 2020-02-29 16:38:31 -05:00
parent 4cade5685c
commit 9b2634a1e5
3 changed files with 50 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libfuse/lib/fuse_dirents.c
View File

@ -17,6 +17,26 @@
#define DEFAULT_SIZE (1024 * 16)
static
uint64_t
dirent_exact_namelen(const struct dirent *d_)
{
#ifdef _D_EXACT_NAMELEN
return _D_EXACT_NAMELEN(d_);
#elif defined _DIRENT_HAVE_D_NAMLEN
return d_->d_namlen;
#else
return strlen(d_->d_name);
#endif
}
static
uint64_t
dirent_alloc_namelen(const struct dirent *d_)
{
return (dirent_exact_namelen(d_) + 1);
}
static
uint64_t
align_uint64_t(uint64_t v_)
@ -251,7 +271,7 @@ fuse_dirents_add(fuse_dirents_t *d_,
return -EINVAL;
}
namelen = _D_ALLOC_NAMLEN(dirent_);
namelen = dirent_alloc_namelen(dirent_);
size = fuse_dirent_size(namelen);
d = fuse_dirents_alloc(d_,size);
@ -288,7 +308,7 @@ fuse_dirents_add_plus(fuse_dirents_t *d_,
break;
}
namelen = _D_ALLOC_NAMLEN(dirent_);
namelen = dirent_alloc_namelen(dirent_);
size = fuse_direntplus_size(namelen);
d = fuse_dirents_alloc(d_,size);

15
src/fuse_readdir_plus_posix.icpp
View File

@ -45,6 +45,19 @@ using std::vector;
namespace l
{
static
uint64_t
dirent_exact_namelen(const struct dirent *d_)
{
#ifdef _D_EXACT_NAMELEN
return _D_EXACT_NAMELEN(d_);
#elif defined _DIRENT_HAVE_D_NAMLEN
return d_->d_namlen;
#else
return strlen(d_->d_name);
#endif
}
static
int
readdir_plus(const Branches &branches_,
@ -83,7 +96,7 @@ namespace l
rv = 0;
for(struct dirent *de = fs::readdir(dh); de && !rv; de = fs::readdir(dh))
{
rv = names.put(de->d_name,_D_EXACT_NAMLEN(de));
rv = names.put(de->d_name,l::dirent_exact_namelen(de));
if(rv == 0)
continue;

15
src/fuse_readdir_posix.icpp
View File

@ -44,6 +44,19 @@ using std::vector;
namespace l
{
static
uint64_t
dirent_exact_namelen(const struct dirent *d_)
{
#ifdef _D_EXACT_NAMELEN
return _D_EXACT_NAMELEN(d_);
#elif defined _DIRENT_HAVE_D_NAMLEN
return d_->d_namlen;
#else
return strlen(d_->d_name);
#endif
}
static
int
readdir(const Branches &branches_,
@ -74,7 +87,7 @@ namespace l
rv = 0;
for(struct dirent *de = fs::readdir(dh); de && !rv; de = fs::readdir(dh))
{
rv = names.put(de->d_name,_D_EXACT_NAMLEN(de));
rv = names.put(de->d_name,l::dirent_exact_namelen(de));
if(rv == 0)
continue;