Public/winfsp
1
0
Fork 0
mirror of https://github.com/winfsp/winfsp.git synced 2025-04-22 08:23:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

dll: fsp_fuse_parse_cmdline, fsp_fuse_main_real: implementation checkpoint

Browse Source
This commit is contained in:
Bill Zissimopoulos 2016-05-31 21:49:58 -07:00
parent b559c7405f
commit 19d400d251
7 changed files with 243 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/VStudio/winfsp_dll.vcxproj
View File

@ -32,6 +32,7 @@
<ItemGroup>
<ClCompile Include="..\..\src\dll\eventlog.c" />
<ClCompile Include="..\..\src\dll\fuse\fuse.c" />
<ClCompile Include="..\..\src\dll\fuse\fuse_main.c" />
<ClCompile Include="..\..\src\dll\fuse\fuse_opt.c" />
<ClCompile Include="..\..\src\dll\np.c" />
<ClCompile Include="..\..\src\dll\security.c" />

3
build/VStudio/winfsp_dll.vcxproj.filters
View File

@ -91,6 +91,9 @@
<ClCompile Include="..\..\src\dll\fuse\fuse_opt.c">
<Filter>Source\fuse</Filter>
</ClCompile>
<ClCompile Include="..\..\src\dll\fuse\fuse_main.c">
<Filter>Source\fuse</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="..\..\src\dll\ntstatus.i">

21
inc/fuse/fuse.h
View File

@ -105,6 +105,13 @@ struct fuse_context
FSP_FUSE_API int fsp_fuse_main_real(struct fsp_fuse_env *env,
int argc, char *argv[],
const struct fuse_operations *ops, size_t opsize, void *data);
FSP_FUSE_API struct fuse *fsp_fuse_setup(struct fsp_fuse_env *env,
int argc, char *argv[],
const struct fuse_operations *ops, size_t opsize,
char **mountpoint, int *multithreaded,
void *data);
FSP_FUSE_API void fsp_fuse_teardown(struct fsp_fuse_env *env,
struct fuse *f, char *mountpoint);
FSP_FUSE_API int fsp_fuse_is_lib_option(struct fsp_fuse_env *env,
const char *opt);
FSP_FUSE_API struct fuse *fsp_fuse_new(struct fsp_fuse_env *env,
@ -126,6 +133,20 @@ static inline int fuse_main_real(int argc, char *argv[],
return fsp_fuse_main_real(fsp_fuse_env(), argc, argv, ops, opsize, data);
}
static inline struct fuse *fuse_setup(int argc, char *argv[],
const struct fuse_operations *ops, size_t opsize,
char **mountpoint, int *multithreaded,
void *data)
{
return fsp_fuse_setup(fsp_fuse_env(),
argc, argv, ops, opsize, mountpoint, multithreaded, data);
}
static inline void fuse_teardown(struct fuse *f, char *mountpoint)
{
fsp_fuse_teardown(fsp_fuse_env(), f, mountpoint);
}
static inline int fuse_is_lib_option(const char *opt)
{
return fsp_fuse_is_lib_option(fsp_fuse_env(), opt);

16
inc/fuse/fuse_common.h
View File

@ -83,8 +83,8 @@ FSP_FUSE_API struct fuse_chan *fsp_fuse_mount(struct fsp_fuse_env *env,
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);
struct fuse_args *args,
char **mountpoint, int *multithreaded, int *foreground);
static inline int fuse_version(void)
{
@ -101,8 +101,8 @@ static inline void fuse_unmount(const char *mountpoint, struct fuse_chan *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)
static inline int fuse_parse_cmdline(struct fuse_args *args,
char **mountpoint, int *multithreaded, int *foreground)
{
return fsp_fuse_parse_cmdline(fsp_fuse_env(), args, mountpoint, multithreaded, foreground);
}
@ -114,19 +114,17 @@ static inline void fuse_pollhandle_destroy(struct fuse_pollhandle *ph)
static inline int fuse_daemonize(int foreground)
{
(void)foreground;
return 0;
return fsp_fuse_daemonize(foreground);
}
static inline int fuse_set_signal_handlers(struct fuse_session *se)
{
(void)se;
return 0;
return fsp_fuse_set_signal_handlers(se);
}
static inline void fuse_remove_signal_handlers(struct fuse_session *se)
{
(void)se;
fsp_fuse_remove_signal_handlers(se);
}
#ifdef __cplusplus

62
inc/fuse/winfsp_fuse.h
View File

@ -46,7 +46,7 @@ extern "C" {
* understanding of the types and ours.
*/
#if defined(_MSC_VER)
#if defined(_WIN64) || defined(_WIN32)
typedef uint32_t fuse_uid_t;
typedef uint32_t fuse_gid_t;
@ -103,9 +103,23 @@ struct fuse_statvfs
};
#if defined(WINFSP_DLL_INTERNAL)
#define FSP_FUSE_ENV_INIT { 'W', MemAlloc, MemFree }
#define FSP_FUSE_ENV_INIT \
{ \
'W', \
MemAlloc, MemFree, \
fsp_fuse_daemonize, \
fsp_fuse_set_signal_handlers, \
fsp_fuse_remove_signal_handlers,\
}
#else
#define FSP_FUSE_ENV_INIT { 'W', malloc, free }
#define FSP_FUSE_ENV_INIT \
{ \
'W', \
malloc, free, \
fsp_fuse_daemonize, \
fsp_fuse_set_signal_handlers, \
fsp_fuse_remove_signal_handlers,\
}
#endif
#elif defined(__CYGWIN__)
@ -136,7 +150,14 @@ struct fuse_statvfs
#define fuse_stat stat
#define fuse_statvfs statvfs
#define FSP_FUSE_ENV_INIT { 'C', malloc, free }
#define FSP_FUSE_ENV_INIT \
{ \
'C', \
malloc, free, \
fsp_fuse_daemonize, \
fsp_fuse_set_signal_handlers, \
fsp_fuse_remove_signal_handlers,\
}
/*
* Note that long is 8 bytes long in Cygwin64 and 4 bytes long in Win64.
@ -152,8 +173,41 @@ struct fsp_fuse_env
unsigned environment;
void *(*memalloc)(size_t);
void (*memfree)(void *);
int (*daemonize)(int);
int (*set_signal_handlers)(void *);
void (*remove_signal_handlers)(void *);
};
static inline int fsp_fuse_daemonize(int foreground)
{
#if defined(_WIN64) || defined(_WIN32)
(void)foreground;
return 0;
#elif defined(__CYGWIN__)
int daemon(int nochdir, int noclose);
int chdir(const char *path);
if (!foreground)
{
if (-1 == daemon(0, 0))
return -1;
}
else
chdir("/");
return 0;
#endif
}
static inline int fsp_fuse_set_signal_handlers(void *se)
{
(void)se;
return 0;
}
static inline void fsp_fuse_remove_signal_handlers(void *se)
{
(void)se;
}
static inline struct fsp_fuse_env *fsp_fuse_env(void)
{
static struct fsp_fuse_env env = FSP_FUSE_ENV_INIT;

16
src/dll/fuse/fuse.c
View File

@ -132,22 +132,6 @@ FSP_FUSE_API void fsp_fuse_unmount(struct fsp_fuse_env *env,
MemFree(ch);
}
FSP_FUSE_API int fsp_fuse_parse_cmdline(struct fsp_fuse_env *env,
struct fuse_args *args, char **mountpoint,
int *multithreaded, int *foreground)
{
// !!!: NEEDIMPL
return 0;
}
FSP_FUSE_API int fsp_fuse_main_real(struct fsp_fuse_env *env,
int argc, char *argv[],
const struct fuse_operations *ops, size_t opsize, void *data)
{
// !!!: NEEDIMPL
return 0;
}
FSP_FUSE_API int fsp_fuse_is_lib_option(struct fsp_fuse_env *env,
const char *opt)
{

153
src/dll/fuse/fuse_main.c Normal file
View File

@ -0,0 +1,153 @@
/**
* @file dll/fuse/fuse_main.c
*
* @copyright 2015-2016 Bill Zissimopoulos
*/
/*
* This file is part of WinFsp.
*
* You can redistribute it and/or modify it under the terms of the
* GNU Affero General Public License version 3 as published by the
* Free Software Foundation.
*
* Licensees holding a valid commercial license may use this file in
* accordance with the commercial license agreement provided with the
* software.
*/
#include <dll/library.h>
#include <fuse/fuse.h>
#define FSP_FUSE_DEFAULT_OPT(n, f, v) { n, offsetof(struct fsp_fuse_default_opt_data, f), v }
struct fsp_fuse_default_opt_data
{
struct fsp_fuse_env *env;
char *mountpoint;
int singlethread;
int foreground;
};
static int fsp_fuse_default_opt_proc(void *data0, const char *arg, int key,
struct fuse_args *outargs)
{
struct fsp_fuse_default_opt_data *data = data0;
switch (key)
{
default:
return 1;
case 'h':
FspServiceLog(EVENTLOG_ERROR_TYPE, L""
"usage: %s mountpoint [options]\n"
"\n"
" -o opt,[opt...] mount options\n"
" -h --help print help\n"
" -V --version print version\n"
"\n"
"FUSE options:\n"
" -d -o debug enable debug output (implies -f)\n"
" -f foreground operation\n"
" -s disable multi-threaded operation\n"
"\n",
FspDiagIdent());
fsp_fuse_opt_add_arg(data->env, outargs, "-h");
return 0;
case 'V':
FspServiceLog(EVENTLOG_ERROR_TYPE,
L"WinFsp-FUSE v%d.%d",
FUSE_MAJOR_VERSION, FUSE_MINOR_VERSION);
return 1;
case FUSE_OPT_KEY_NONOPT:
if (0 == data->mountpoint)
{
size_t size = lstrlenA(arg) + 1;
data->mountpoint = data->env->memalloc(size);
if (0 == data->mountpoint)
return -1;
memcpy(data->mountpoint, arg, size);
}
else
FspServiceLog(EVENTLOG_ERROR_TYPE,
L"invalid argument \"%S\"", arg);
return 1;
}
}
FSP_FUSE_API int fsp_fuse_parse_cmdline(struct fsp_fuse_env *env,
struct fuse_args *args,
char **mountpoint, int *multithreaded, int *foreground)
{
static struct fuse_opt opts[] =
{
FSP_FUSE_DEFAULT_OPT("-d", foreground, 1),
FSP_FUSE_DEFAULT_OPT("debug", foreground, 1),
FSP_FUSE_DEFAULT_OPT("-f", foreground, 1),
FSP_FUSE_DEFAULT_OPT("-s", singlethread, 1),
FUSE_OPT_KEY("-d", FUSE_OPT_KEY_KEEP),
FUSE_OPT_KEY("debug", FUSE_OPT_KEY_KEEP),
FUSE_OPT_KEY("-h", 'h'),
FUSE_OPT_KEY("--help", 'h'),
FUSE_OPT_KEY("--ho", 'h'),
FUSE_OPT_KEY("-V", 'V'),
FUSE_OPT_KEY("--version", 'V'),
FUSE_OPT_END,
};
struct fsp_fuse_default_opt_data data;
memset(&data, 0, sizeof data);
data.env = env;
if (-1 == fsp_fuse_opt_parse(env, args, &data, opts, fsp_fuse_default_opt_proc))
return -1;
if (0 != mountpoint)
*mountpoint = data.mountpoint;
else
env->memfree(mountpoint);
if (0 != multithreaded)
*multithreaded = !data.singlethread;
if (0 != foreground)
*foreground = data.foreground;
return 0;
}
FSP_FUSE_API int fsp_fuse_main_real(struct fsp_fuse_env *env,
int argc, char *argv[],
const struct fuse_operations *ops, size_t opsize, void *data)
{
struct fuse *f;
char *mountpoint = 0;
int multithreaded = 0;
int result;
f = fsp_fuse_setup(env, argc, argv, ops, opsize, &mountpoint, &multithreaded, data);
if (0 == f)
return 1;
result = multithreaded ? fsp_fuse_loop_mt(env, f) : fsp_fuse_loop(env, f);
fsp_fuse_teardown(env, f, mountpoint);
/* main() style return: 0 success, 1 error */
return !!result;
}
FSP_FUSE_API struct fuse *fsp_fuse_setup(struct fsp_fuse_env *env,
int argc, char *argv[],
const struct fuse_operations *ops, size_t opsize,
char **mountpoint, int *multithreaded,
void *data)
{
// !!!: NEEDIMPL
return 0;
}
FSP_FUSE_API void fsp_fuse_teardown(struct fsp_fuse_env *env,
struct fuse *f, char *mountpoint)
{
// !!!: NEEDIMPL
}