diff options
author | randomdan <randomdan@localhost> | 2013-08-22 01:13:45 +0000 |
---|---|---|
committer | randomdan <randomdan@localhost> | 2013-08-22 01:13:45 +0000 |
commit | a9dc04d6aa70bcbf20d28ed8cb9631afa7434a9e (patch) | |
tree | 74fb166e2b6758afd6120088de179114d3679cc9 /libfusepp/fuseapp.cpp | |
parent | Emergency I-broke-it-bump, don't bind write_buf and read_buf (diff) | |
download | netfs-a9dc04d6aa70bcbf20d28ed8cb9631afa7434a9e.tar.bz2 netfs-a9dc04d6aa70bcbf20d28ed8cb9631afa7434a9e.tar.xz netfs-a9dc04d6aa70bcbf20d28ed8cb9631afa7434a9e.zip |
Only bind fuse wrappers into fuse_operations for functions that have overrides in a deriving class
Diffstat (limited to 'libfusepp/fuseapp.cpp')
-rw-r--r-- | libfusepp/fuseapp.cpp | 98 |
1 files changed, 10 insertions, 88 deletions
diff --git a/libfusepp/fuseapp.cpp b/libfusepp/fuseapp.cpp index 196d72d..1a6494a 100644 --- a/libfusepp/fuseapp.cpp +++ b/libfusepp/fuseapp.cpp @@ -6,7 +6,7 @@ #include <stdlib.h> #include <typeinfo> -static FuseAppBase * fuseApp; +FuseAppBase * FuseAppBase::fuseApp; FuseAppBase::FuseAppBase() { @@ -178,115 +178,37 @@ int FuseAppBase::flock(const char *, struct fuse_file_info *, int) { return -ENOSYS; } +int FuseAppBase::fallocate(const char *, int, off_t, off_t, struct fuse_file_info *) +{ + return -ENOSYS; +} int FuseAppBase::onError(const std::exception & e) throw() { fprintf(stderr, "Unknown exception calling (what: %s)\n", e.what()); return -ENOSYS; } -template <typename... Args> -class fuseCall { - public: - template <int (FuseAppBase::*f)(Args...)> - static int helper(Args ... a) - { - try { - return (fuseApp->*f)(a...); - } - catch (const std::exception & ex) { - if (int rtn = fuseApp->onError(ex)) { - return rtn; - } - return helper<f>(a...); - } - catch (...) { - fprintf(stderr, "Unknown exception calling %s\n", typeid(f).name()); - return -ENOSYS; - } - } -}; -static void * fuseInit (struct fuse_conn_info *conn) +void * FuseAppBase::fuseInit (struct fuse_conn_info *conn) { return fuseApp->init(conn); } -static void fuseDestroy(void *) +void FuseAppBase::fuseDestroy(void *) { delete fuseApp; } -int -FuseAppBase::run(int & argc, char** & argv, FuseAppBase * fa) +struct fuse_args +FuseAppBase::runint(int & argc, char** & argv, FuseAppBase * fa) { struct fuse_opt fuse_opts[] = { { NULL, 0, 0 } }; fuseApp = fa; - struct fuse_operations operations = { - fuseCall<const char *, struct stat *>::helper<&FuseAppBase::getattr>, - fuseCall<const char *, char *, size_t>::helper<&FuseAppBase::readlink>, - NULL, // getdir deprecated - fuseCall<const char *, mode_t, dev_t>::helper<&FuseAppBase::mknod>, - fuseCall<const char *, mode_t>::helper<&FuseAppBase::mkdir>, - fuseCall<const char *>::helper<&FuseAppBase::unlink>, - fuseCall<const char *>::helper<&FuseAppBase::rmdir>, - fuseCall<const char *, const char *>::helper<&FuseAppBase::symlink>, - fuseCall<const char *, const char *>::helper<&FuseAppBase::rename>, - fuseCall<const char *, const char *>::helper<&FuseAppBase::link>, - fuseCall<const char *, mode_t>::helper<&FuseAppBase::chmod>, - fuseCall<const char *, uid_t, gid_t>::helper<&FuseAppBase::chown>, - fuseCall<const char *, off_t>::helper<&FuseAppBase::truncate>, - NULL, // utime deprecated - fuseCall<const char *, struct fuse_file_info *>::helper<&FuseAppBase::open>, - fuseCall<const char *, char *, size_t, off_t, struct fuse_file_info *>::helper<&FuseAppBase::read>, - fuseCall<const char *, const char *, size_t, off_t, struct fuse_file_info *>::helper<&FuseAppBase::write>, - fuseCall<const char *, struct statvfs *>::helper<&FuseAppBase::statfs>, - fuseCall<const char *, struct fuse_file_info *>::helper<&FuseAppBase::flush>, - fuseCall<const char *, struct fuse_file_info *>::helper<&FuseAppBase::release>, - fuseCall<const char *, int, struct fuse_file_info *>::helper<&FuseAppBase::fsync>, - fuseCall<const char *, const char *, const char *, size_t, int>::helper<&FuseAppBase::setxattr>, - fuseCall<const char *, const char *, char *, size_t>::helper<&FuseAppBase::getxattr>, - fuseCall<const char *, char *, size_t>::helper<&FuseAppBase::listxattr>, - fuseCall<const char *, const char *>::helper<&FuseAppBase::removexattr>, - fuseCall<const char *, struct fuse_file_info *>::helper<&FuseAppBase::opendir>, - fuseCall<const char *, void *, fuse_fill_dir_t, off_t, struct fuse_file_info *>::helper<&FuseAppBase::readdir>, - fuseCall<const char *, struct fuse_file_info *>::helper<&FuseAppBase::releasedir>, - fuseCall<const char *, int, struct fuse_file_info *>::helper<&FuseAppBase::fsyncdir>, - fuseInit, - fuseDestroy, - fuseCall<const char *, int>::helper<&FuseAppBase::access>, - fuseCall<const char *, mode_t, struct fuse_file_info *>::helper<&FuseAppBase::create>, - fuseCall<const char *, off_t, struct fuse_file_info *>::helper<&FuseAppBase::ftruncate>, - fuseCall<const char *, struct stat *, struct fuse_file_info *>::helper<&FuseAppBase::fgetattr> -#if (FUSE_MINOR_VERSION >= 6) - , - fuseCall<const char *, struct fuse_file_info *, int, struct flock *>::helper<&FuseAppBase::lock>, - fuseCall<const char *, const struct timespec [2]>::helper<&FuseAppBase::utimens>, - fuseCall<const char *, size_t, uint64_t *>::helper<&FuseAppBase::bmap> -#if (FUSE_MINOR_VERSION >= 8) - , - 0, // flag_nullpath_ok -#if (FUSE_MINOR_VERSION >= 9) - 0, // flag_nopath - 0, // flag_utime_omit_ok -#endif - 0, // flag_reserved - fuseCall<const char *, int, void *, struct fuse_file_info *, unsigned int, void *>::helper<&FuseAppBase::ioctl>, - fuseCall<const char *, struct fuse_file_info *, struct fuse_pollhandle *, unsigned *>::helper<&FuseAppBase::poll> -#if (FUSE_MINOR_VERSION >= 9) - , - 0, //fuseCall<const char *, struct fuse_bufvec *, off_t, struct fuse_file_info *>::helper<&FuseAppBase::write_buf>, - 0, //fuseCall<const char *, struct fuse_bufvec **, size_t, off_t, struct fuse_file_info *>::helper<&FuseAppBase::read_buf>, - fuseCall<const char *, struct fuse_file_info *, int>::helper<&FuseAppBase::flock>, - NULL // fallocate -#endif -#endif -#endif - }; struct fuse_args args = FUSE_ARGS_INIT(argc, argv); if (fuse_opt_parse(&args, fuseApp, fuse_opts, fuseCall<void *, const char *, int, struct fuse_args *>::helper<&FuseAppBase::opt_parse>) == -1) { exit(1); } - return fuse_main(args.argc, args.argv, &operations, fa); + return args; } |