From 23b8e4582e145952ef1916384f33b7748d740f47 Mon Sep 17 00:00:00 2001 From: Antonio SJ Musumeci Date: Wed, 11 May 2016 11:22:00 -0400 Subject: [PATCH] fix ioctl on directories --- src/ioctl.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/ioctl.cpp b/src/ioctl.cpp index 4b35b1dd..19bdbb0e 100644 --- a/src/ioctl.cpp +++ b/src/ioctl.cpp @@ -20,8 +20,10 @@ #include #include +#include #include -#include +#include +#include #include "config.hpp" #include "fileinfo.hpp" @@ -48,10 +50,6 @@ _ioctl(const int fd, #ifdef FUSE_IOCTL_DIR -#ifndef O_DIRECTORY -#define O_DIRECTORY 0 -#endif - #ifndef O_NOATIME #define O_NOATIME 0 #endif @@ -76,7 +74,7 @@ _ioctl_dir_base(Policy::Func::Search searchFunc, fs::path::make(basepaths[0],fusepath,fullpath); - const int flags = O_RDWR | O_NOATIME | O_DIRECTORY; + const int flags = O_RDONLY | O_NOATIME | O_NONBLOCK; fd = ::open(fullpath.c_str(),flags); if(fd == -1) return -errno;