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

Merge pull request #35 from trapexit/dttoif

Browse Source 
provide stat to readdir filler. closes #32
This commit is contained in:
Antonio SJ Musumeci 2014-11-10 21:11:17 -05:00
commit 90b0fcd5f5
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/readdir.cpp
View File

@ -22,6 +22,8 @@
THE SOFTWARE. THE SOFTWARE.
*/ */
#define _BSD_SOURCE
#include <fuse.h> #include <fuse.h>
#include <string> #include <string>
@ -53,6 +55,7 @@ _readdir(const vector<string> &srcmounts,
const fuse_fill_dir_t filler) const fuse_fill_dir_t filler)
{ {
set<string> found; set<string> found;
struct stat st = {0};
for(vector<string>::const_iterator for(vector<string>::const_iterator
iter = srcmounts.begin(), enditer = srcmounts.end(); iter = srcmounts.begin(), enditer = srcmounts.end();
@ -69,12 +72,11 @@ _readdir(const vector<string> &srcmounts,
for(struct dirent *de = ::readdir(dh); de != NULL; de = ::readdir(dh)) for(struct dirent *de = ::readdir(dh); de != NULL; de = ::readdir(dh))
{ {
string d_name(de->d_name); if(found.insert(de->d_name).second == false)
if(found.insert(d_name).second == false)
continue; continue;
if(filler(buf,de->d_name,NULL,NO_OFFSET) != 0) st.st_mode = DTTOIF(de->d_type);
if(filler(buf,de->d_name,&st,NO_OFFSET) != 0)
return -ENOMEM; return -ENOMEM;
} }