Public/winfsp
1
0
Fork 0
mirror of https://github.com/winfsp/winfsp.git synced 2025-06-14 15:52:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

fuse: introduction of fsp_fuse_env and major refactoring

Browse Source
This commit is contained in:
Bill Zissimopoulos
2016-05-31 10:53:22 -07:00
parent 4a4dab14c5
commit 300ce8485b
9 changed files with 322 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

145
inc/fuse/fuse_common.h
View File

@ -23,31 +23,13 @@
#ifndef FUSE_COMMON_H_
#define FUSE_COMMON_H_
#include <stdint.h>
#include "winfsp_fuse.h"
#include "fuse_opt.h"
#ifdef __cplusplus
extern "C" {
#endif
#if !defined(FSP_FUSE_API)
#if defined(WINFSP_DLL_INTERNAL)
#define FSP_FUSE_API __declspec(dllexport)
#else
#define FSP_FUSE_API __declspec(dllimport)
#endif
#endif
#if !defined(FSP_FUSE_MEMFN_P)
#define FSP_FUSE_MEMFN_P void *(*memalloc)(size_t), void (*memfree)(void *)
#define FSP_FUSE_MEMFN_A memalloc, memfree
#if defined(WINFSP_DLL_INTERNAL)
#define FSP_FUSE_MEMFN_V MemAlloc, MemFree
#else
#define FSP_FUSE_MEMFN_V malloc, free
#endif
#endif
#define FUSE_MAJOR_VERSION 2
#define FUSE_MINOR_VERSION 8
#define FUSE_MAKE_VERSION(maj, min) ((maj) * 10 + (min))
@ -65,108 +47,6 @@ extern "C" {
#define FUSE_IOCTL_RETRY (1 << 2)
#define FUSE_IOCTL_MAX_IOV 256
/*
* FUSE uses a number of types (notably: struct stat) that are OS specific.
* Furthermore there are sometimes multiple definitions of the same type even
* within the same OS. This is certainly true on Windows, where these types
* are not even native.
*
* For this reason we will define our own fuse_* types which represent the
* types as the WinFsp DLL expects to see them. When the file is included
* by FUSE clients in different environments we will translate between their
* understanding of the types and ours.
*/
#if defined(_MSC_VER)
typedef uint32_t fuse_uid_t;
typedef uint32_t fuse_gid_t;
typedef int32_t fuse_pid_t;
typedef uint64_t fuse_dev_t;
typedef uint64_t fuse_ino_t;
typedef uint32_t fuse_mode_t;
typedef uint32_t fuse_nlink_t;
typedef int64_t fuse_off_t;
typedef uint64_t fuse_fsblkcnt_t;
typedef uint64_t fuse_fsfilcnt_t;
typedef int32_t fuse_blksize_t;
typedef int32_t fuse_blkcnt_t;
struct fuse_timespec
{
time_t tv_sec;
int tv_nsec;
};
struct fuse_stat
{
fuse_dev_t st_dev;
fuse_ino_t st_ino;
fuse_mode_t st_mode;
fuse_nlink_t st_nlink;
fuse_uid_t st_uid;
fuse_gid_t st_gid;
fuse_dev_t st_rdev;
fuse_off_t st_size;
struct fuse_timespec st_atim;
struct fuse_timespec st_mtim;
struct fuse_timespec st_ctim;
fuse_blksize_t st_blksize;
fuse_blkcnt_t st_blocks;
struct fuse_timespec st_birthtim;
};
struct fuse_statvfs
{
unsigned int f_bsize;
unsigned int f_frsize;
fuse_fsblkcnt_t f_blocks;
fuse_fsblkcnt_t f_bfree;
fuse_fsblkcnt_t f_bavail;
fuse_fsfilcnt_t f_files;
fuse_fsfilcnt_t f_ffree;
fuse_fsfilcnt_t f_favail;
unsigned int f_fsid;
unsigned int f_flag;
unsigned int f_namemax;
};
#define FSP_FUSE_ENVIRONMENT 'W'
#elif defined(__CYGWIN__)
#include <errno.h>
#include <sys/stat.h>
#include <sys/statvfs.h>
#include <sys/types.h>
#include <utime.h>
#define fuse_uid_t uid_t
#define fuse_gid_t gid_t
#define fuse_pid_t pid_t
#define fuse_dev_t dev_t
#define fuse_ino_t ino_t
#define fuse_mode_t mode_t
#define fuse_nlink_t nlink_t
#define fuse_off_t off_t
#define fuse_fsblkcnt_t fsblkcnt_t
#define fuse_fsfilcnt_t fsfilcnt_t
#define fuse_blksize_t blksize_t
#define fuse_blkcnt_t blkcnt_t
#define fuse_timespec timespec
#define fuse_stat stat
#define fuse_statvfs statvfs
#define FSP_FUSE_ENVIRONMENT 'C'
#else
#error unsupported environment
#endif
struct fuse_file_info
{
int flags;
@ -197,33 +77,34 @@ struct fuse_session;
struct fuse_chan;
struct fuse_pollhandle;
FSP_FUSE_API int fsp_fuse_version(void);
FSP_FUSE_API struct fuse_chan *fsp_fuse_mount(const char *mountpoint, struct fuse_args *args);
FSP_FUSE_API void fsp_fuse_unmount(const char *mountpoint, struct fuse_chan *ch);
FSP_FUSE_API int fsp_fuse_parse_cmdline(struct fuse_args *args, char **mountpoint,
int *multithreaded, int *foreground,
FSP_FUSE_MEMFN_P);
FSP_FUSE_API int fsp_fuse_version(struct fsp_fuse_env *env);
FSP_FUSE_API struct fuse_chan *fsp_fuse_mount(struct fsp_fuse_env *env,
const char *mountpoint, struct fuse_args *args);
FSP_FUSE_API void fsp_fuse_unmount(struct fsp_fuse_env *env,
const char *mountpoint, struct fuse_chan *ch);
FSP_FUSE_API int fsp_fuse_parse_cmdline(struct fsp_fuse_env *env,
struct fuse_args *args, char **mountpoint,
int *multithreaded, int *foreground);
static inline int fuse_version(void)
{
return fsp_fuse_version();
return fsp_fuse_version(fsp_fuse_env());
}
static inline struct fuse_chan *fuse_mount(const char *mountpoint, struct fuse_args *args)
{
return fsp_fuse_mount(mountpoint, args);
return fsp_fuse_mount(fsp_fuse_env(), mountpoint, args);
}
static inline void fuse_unmount(const char *mountpoint, struct fuse_chan *ch)
{
fsp_fuse_unmount(mountpoint, ch);
fsp_fuse_unmount(fsp_fuse_env(), mountpoint, ch);
}
static inline int fuse_parse_cmdline(struct fuse_args *args, char **mountpoint,
int *multithreaded, int *foreground)
{
return fsp_fuse_parse_cmdline(args, mountpoint, multithreaded, foreground,
FSP_FUSE_MEMFN_V);
return fsp_fuse_parse_cmdline(fsp_fuse_env(), args, mountpoint, multithreaded, foreground);
}
static inline void fuse_pollhandle_destroy(struct fuse_pollhandle *ph)