opengnsys
/
ntfs-3g
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable ioctl in ntfs-3g unconditionally when building with fuse-lite. 

fuse-lite announces a FUSE_VERSION which may not always match the exact
capabilities of the library. Hence we add a special case for 'ioctl',
which we know exists in fuse-lite regardless of the version number
published.
edge.strict_endians
Erik Larsson 2015-03-14 11:11:43 +01:00
parent 1ebf77f769
commit 807ee0f26c
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lowntfs-3g.c
View File

@ -2606,7 +2606,7 @@ static void ntfs_fuse_fsync(fuse_req_t req,
fuse_reply_err(req, 0);
}
#if FUSE_VERSION >= 28
#if defined(FUSE_INTERNAL) || (FUSE_VERSION >= 28)
static void ntfs_fuse_ioctl(fuse_req_t req __attribute__((unused)),
fuse_ino_t ino __attribute__((unused)),
int cmd, void *arg,
@ -2648,7 +2648,7 @@ fail :
if (buf)
free(buf);
}
#endif /* FUSE_VERSION >= 28 */
#endif /* defined(FUSE_INTERNAL) || (FUSE_VERSION >= 28) */
static void ntfs_fuse_bmap(fuse_req_t req, fuse_ino_t ino, size_t blocksize,
uint64_t vidx)
@ -3600,9 +3600,9 @@ static struct fuse_lowlevel_ops ntfs_3g_ops = {
.fsyncdir = ntfs_fuse_fsync,
.bmap = ntfs_fuse_bmap,
.destroy = ntfs_fuse_destroy2,
#if FUSE_VERSION >= 28
#if defined(FUSE_INTERNAL) || (FUSE_VERSION >= 28)
.ioctl = ntfs_fuse_ioctl,
#endif /* FUSE_VERSION >= 28 */
#endif /* defined(FUSE_INTERNAL) || (FUSE_VERSION >= 28) */
#if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
.access = ntfs_fuse_access,
#endif

8
src/ntfs-3g.c
View File

@ -2446,7 +2446,7 @@ static int ntfs_fuse_fsync(const char *path __attribute__((unused)),
return (ret);
}
#if FUSE_VERSION >= 28
#if defined(FUSE_INTERNAL) || (FUSE_VERSION >= 28)
static int ntfs_fuse_ioctl(const char *path,
int cmd, void *arg,
struct fuse_file_info *fi __attribute__((unused)),
@ -2468,7 +2468,7 @@ static int ntfs_fuse_ioctl(const char *path,
set_fuse_error(&ret);
return ret;
}
#endif /* FUSE_VERSION >= 28 */
#endif /* defined(FUSE_INTERNAL) || (FUSE_VERSION >= 28) */
static int ntfs_fuse_bmap(const char *path, size_t blocksize, uint64_t *idx)
{
@ -3421,9 +3421,9 @@ static struct fuse_operations ntfs_3g_ops = {
.fsyncdir = ntfs_fuse_fsync,
.bmap = ntfs_fuse_bmap,
.destroy = ntfs_fuse_destroy2,
#if FUSE_VERSION >= 28
#if defined(FUSE_INTERNAL) || (FUSE_VERSION >= 28)
.ioctl = ntfs_fuse_ioctl,
#endif /* FUSE_VERSION >= 28 */
#endif /* defined(FUSE_INTERNAL) || (FUSE_VERSION >= 28) */
#if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
.access = ntfs_fuse_access,
.opendir = ntfs_fuse_opendir,