Archives/falk-werner_webfuse
1
0
Fork 0
mirror of https://github.com/falk-werner/webfuse synced 2025-06-13 12:54:15 +00:00
Code Issues Releases Wiki Activity

feature: allow to specify mount options

Browse Source
This commit is contained in:
Falk Werner 2020-11-13 04:43:46 +01:00
parent 77ede52c92
commit 9f08154af9
5 changed files with 92 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/webfuse/mountpoint.h
View File

@ -76,6 +76,20 @@ wf_mountpoint_set_userdata(
void * user_data,
wf_mountpoint_userdata_dispose_fn * dispose);
//------------------------------------------------------------------------------
/// \brief Adds a mount option.
///
/// Mount options are passed to libfuse when a filesystem is mounted.
/// See libfuse documenation for allowed values.
///
/// \param mountpoint pointer to the mountpooint
/// \param option value of the mount option
//------------------------------------------------------------------------------
extern WF_API void
wf_mountpoint_add_mountoption(
struct wf_mountpoint * mountpoint,
char const * option);
#ifdef __cplusplus
}
#endif

8
lib/webfuse/api.c
View File

@ -202,6 +202,14 @@ wf_mountpoint_set_userdata(
wf_impl_mountpoint_set_userdata(mountpoint, user_data, dispose);
}
void
wf_mountpoint_add_mountoption(
struct wf_mountpoint * mountpoint,
char const * option)
{
wf_impl_mountpoint_add_mountoption(mountpoint, option);
}
// client
struct wf_client *

6
lib/webfuse/impl/filesystem.c
View File

@ -47,7 +47,6 @@ static void wf_impl_filesystem_cleanup(
free(filesystem->user_data.name);
}
static bool wf_impl_filesystem_init(
struct wf_impl_filesystem * filesystem,
struct lws * session_wsi,
@ -57,9 +56,8 @@ static bool wf_impl_filesystem_init(
{
bool result = false;
char * argv[] = {"", NULL};
filesystem->args.argc = 1;
filesystem->args.argv = argv;
filesystem->args.argc = mountpoint->options.size;
filesystem->args.argv = mountpoint->options.items;
filesystem->args.allocated = 0;
filesystem->user_data.proxy = proxy;

35
lib/webfuse/impl/mountpoint.c
View File

@ -3,12 +3,7 @@
#include <stdlib.h>
#include <string.h>
struct wf_mountpoint
{
char * path;
void * user_data;
wf_mountpoint_userdata_dispose_fn * dispose;
};
#define WF_MOUNTOPTIONS_INITIAL_CAPACITY 8
struct wf_mountpoint *
wf_impl_mountpoint_create(
@ -18,6 +13,11 @@ wf_impl_mountpoint_create(
mountpoint->path = strdup(path);
mountpoint->user_data = NULL;
mountpoint->dispose = NULL;
mountpoint->options.size = 1;
mountpoint->options.capacity = WF_MOUNTOPTIONS_INITIAL_CAPACITY;
mountpoint->options.items = malloc(sizeof(char*) * mountpoint->options.capacity);
mountpoint->options.items[0] = strdup("");
mountpoint->options.items[1] = NULL;
return mountpoint;
}
@ -31,6 +31,12 @@ wf_impl_mountpoint_dispose(
mountpoint->dispose(mountpoint->user_data);
}
for(size_t i = 0; i < mountpoint->options.size; i++)
{
free(mountpoint->options.items[i]);
}
free(mountpoint->options.items);
free(mountpoint->path);
free(mountpoint);
}
@ -51,3 +57,20 @@ wf_impl_mountpoint_set_userdata(
mountpoint->user_data = user_data;
mountpoint->dispose = dispose;
}
void
wf_impl_mountpoint_add_mountoption(
struct wf_mountpoint * mountpoint,
char const * option)
{
if ((mountpoint->options.size + 1) >= mountpoint->options.capacity)
{
mountpoint->options.capacity *= 2;
mountpoint->options.items = realloc(mountpoint->options.items,
sizeof(char*) * mountpoint->options.capacity);
}
mountpoint->options.items[mountpoint->options.size] = strdup(option);
mountpoint->options.items[mountpoint->options.size + 1] = NULL;
mountpoint->options.size++;
}

26
lib/webfuse/impl/mountpoint.h
View File

@ -3,11 +3,32 @@
#include "webfuse/mountpoint.h"
#ifndef __cplusplus
#include <stddef.h>
#else
#include <cstddef>
#endif
#ifdef __cplusplus
extern "C"
{
#endif
struct wf_mountoptions
{
char * * items;
size_t size;
size_t capacity;
};
struct wf_mountpoint
{
char * path;
void * user_data;
wf_mountpoint_userdata_dispose_fn * dispose;
struct wf_mountoptions options;
};
extern struct wf_mountpoint *
wf_impl_mountpoint_create(
char const * path);
@ -26,6 +47,11 @@ wf_impl_mountpoint_set_userdata(
void * user_data,
wf_mountpoint_userdata_dispose_fn * dispose);
extern void
wf_impl_mountpoint_add_mountoption(
struct wf_mountpoint * mountpoint,
char const * option);
#ifdef __cplusplus
}
#endif