1
0
mirror of https://github.com/falk-werner/webfuse synced 2025-06-13 12:54:15 +00:00

puts core files into core directories

This commit is contained in:
Falk Werner 2019-03-24 18:26:38 +01:00
parent bd1032c494
commit 11724ec792
30 changed files with 36 additions and 35 deletions

View File

@ -45,14 +45,12 @@ set(EXTRA_CFLAGS
) )
install(FILES include/wsfs/status.h DESTINATION include/wsfs)
# libwsfs-core # libwsfs-core
add_library(wsfs-core STATIC add_library(wsfs-core STATIC
lib/wsfs/message.c lib/wsfs/core/message.c
lib/wsfs/message_queue.c lib/wsfs/core/message_queue.c
lib/wsfs/status.c lib/wsfs/core/status.c
) )
set_target_properties(wsfs-core PROPERTIES OUTPUT_NAME wsfs-core) set_target_properties(wsfs-core PROPERTIES OUTPUT_NAME wsfs-core)
@ -60,6 +58,9 @@ target_include_directories(wsfs-core PUBLIC lib ${EXTRA_INCLUDE_DIRS})
target_compile_options(wsfs-core PUBLIC ${EXTRA_CFLAGS}) target_compile_options(wsfs-core PUBLIC ${EXTRA_CFLAGS})
set_target_properties(wsfs-core PROPERTIES C_VISIBILITY_PRESET hidden) set_target_properties(wsfs-core PROPERTIES C_VISIBILITY_PRESET hidden)
install(DIRECTORY include/wsfs/core DESTINATION include/wsfs)
# libwsfs-adapter # libwsfs-adapter
add_library(wsfs-adapter-static STATIC add_library(wsfs-adapter-static STATIC

View File

@ -2,7 +2,7 @@
#define WSFSP_OPERATION_ERROR_H #define WSFSP_OPERATION_ERROR_H
#include "wsfs/provider/api.h" #include "wsfs/provider/api.h"
#include "wsfs/status.h" #include "wsfs/core/status.h"
struct wsfsp_request; struct wsfsp_request;

View File

@ -1,7 +1,7 @@
#ifndef WSFS_ADAPTER_H #ifndef WSFS_ADAPTER_H
#define WSFS_ADAPTER_H #define WSFS_ADAPTER_H
#include <wsfs/status.h> #include <wsfs/core/status.h>
#include <wsfs/adapter/api.h> #include <wsfs/adapter/api.h>
#include <wsfs/adapter/server.h> #include <wsfs/adapter/server.h>

View File

@ -1,7 +1,7 @@
#ifndef WSFS_PROVIDER_H #ifndef WSFS_PROVIDER_H
#define WSFS_PROVIDER_H #define WSFS_PROVIDER_H
#include <wsfs/status.h> #include <wsfs/core/status.h>
#include <wsfs/provider/api.h> #include <wsfs/provider/api.h>
#include <wsfs/provider/client.h> #include <wsfs/provider/client.h>

View File

@ -6,7 +6,7 @@
#endif #endif
#include <jansson.h> #include <jansson.h>
#include "wsfs/status.h" #include "wsfs/core/status.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"

View File

@ -9,7 +9,7 @@ using std::size_t;
#endif #endif
#include <jansson.h> #include <jansson.h>
#include "wsfs/status.h" #include "wsfs/core/status.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

View File

@ -5,7 +5,7 @@
#include <jansson.h> #include <jansson.h>
#include "wsfs/adapter/impl/jsonrpc/server.h" #include "wsfs/adapter/impl/jsonrpc/server.h"
#include "wsfs/util.h" #include "wsfs/core/util.h"
void wsfs_impl_operation_close( void wsfs_impl_operation_close(
fuse_req_t request, fuse_req_t request,

View File

@ -9,7 +9,7 @@
#include "wsfs/adapter/impl/jsonrpc/server.h" #include "wsfs/adapter/impl/jsonrpc/server.h"
#include "wsfs/adapter/impl/jsonrpc/util.h" #include "wsfs/adapter/impl/jsonrpc/util.h"
#include "wsfs/util.h" #include "wsfs/core/util.h"
struct wsfs_impl_operation_getattr_context struct wsfs_impl_operation_getattr_context
{ {

View File

@ -12,7 +12,7 @@
#include "wsfs/adapter/impl/jsonrpc/server.h" #include "wsfs/adapter/impl/jsonrpc/server.h"
#include "wsfs/adapter/impl/jsonrpc/util.h" #include "wsfs/adapter/impl/jsonrpc/util.h"
#include "wsfs/util.h" #include "wsfs/core/util.h"
struct wsfs_impl_operation_lookup_context struct wsfs_impl_operation_lookup_context
{ {

View File

@ -5,8 +5,8 @@
#include <jansson.h> #include <jansson.h>
#include "wsfs/adapter/impl/jsonrpc/server.h" #include "wsfs/adapter/impl/jsonrpc/server.h"
#include "wsfs/util.h" #include "wsfs/core/util.h"
#include "wsfs/status.h" #include "wsfs/core/status.h"
static void wsfs_impl_operation_open_finished( static void wsfs_impl_operation_open_finished(
void * user_data, void * user_data,

View File

@ -9,7 +9,7 @@
#include <unistd.h> #include <unistd.h>
#include "wsfs/adapter/impl/jsonrpc/server.h" #include "wsfs/adapter/impl/jsonrpc/server.h"
#include "wsfs/util.h" #include "wsfs/core/util.h"
#define WSFS_DIRBUFFER_INITIAL_SIZE 1024 #define WSFS_DIRBUFFER_INITIAL_SIZE 1024

View File

@ -3,8 +3,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <libwebsockets.h> #include <libwebsockets.h>
#include "wsfs/message.h" #include "wsfs/core/message.h"
#include "wsfs/util.h" #include "wsfs/core/util.h"
#include "wsfs/adapter/impl/filesystem.h" #include "wsfs/adapter/impl/filesystem.h"

View File

@ -1,7 +1,7 @@
#include "wsfs/adapter/impl/session.h" #include "wsfs/adapter/impl/session.h"
#include "wsfs/adapter/impl/authenticators.h" #include "wsfs/adapter/impl/authenticators.h"
#include "wsfs/message_queue.h" #include "wsfs/core/message_queue.h"
#include "wsfs/message.h" #include "wsfs/core/message.h"
#include "wsfs/adapter/impl/jsonrpc/server.h" #include "wsfs/adapter/impl/jsonrpc/server.h"
#include <libwebsockets.h> #include <libwebsockets.h>

View File

@ -9,7 +9,7 @@
using std::size_t; using std::size_t;
#endif #endif
#include "wsfs/message_queue.h" #include "wsfs/core/message_queue.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"

View File

@ -1,4 +1,4 @@
#include "wsfs/message.h" #include "wsfs/core/message.h"
#include <stdlib.h> #include <stdlib.h>
#include <libwebsockets.h> #include <libwebsockets.h>

View File

@ -1,5 +1,5 @@
#include "wsfs/message_queue.h" #include "wsfs/core/message_queue.h"
#include "wsfs/message.h" #include "wsfs/core/message.h"
void wsfs_message_queue_init( void wsfs_message_queue_init(
struct wsfs_message_queue * queue) struct wsfs_message_queue * queue)

View File

@ -1,4 +1,4 @@
#include "wsfs/status_intern.h" #include "wsfs/core/status_intern.h"
#include <errno.h> #include <errno.h>

View File

@ -1,7 +1,7 @@
#ifndef WSFS_STATUS_INTERN_H #ifndef WSFS_STATUS_INTERN_H
#define WSFS_STATUS_INTERN_H #define WSFS_STATUS_INTERN_H
#include "wsfs/status.h" #include "wsfs/core/status.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

View File

@ -8,8 +8,8 @@
#include "wsfs/provider/provider.h" #include "wsfs/provider/provider.h"
#include "wsfs/util.h" #include "wsfs/core/util.h"
#include "wsfs/message.h" #include "wsfs/core/message.h"
static void wsfsp_client_protocol_respond( static void wsfsp_client_protocol_respond(
json_t * response, json_t * response,

View File

@ -5,7 +5,7 @@
#include "wsfs/provider/provider.h" #include "wsfs/provider/provider.h"
#include "wsfs/provider/request.h" #include "wsfs/provider/request.h"
#include "wsfs/message_queue.h" #include "wsfs/core/message_queue.h"
struct wsfsp_client_protocol struct wsfsp_client_protocol
{ {

View File

@ -1,6 +1,6 @@
#include "wsfs/provider/operation/close_intern.h" #include "wsfs/provider/operation/close_intern.h"
#include <limits.h> #include <limits.h>
#include "wsfs/util.h" #include "wsfs/core/util.h"
void wsfsp_close( void wsfsp_close(
struct wsfsp_invokation_context * context, struct wsfsp_invokation_context * context,

View File

@ -4,7 +4,7 @@
#include "wsfs/provider/operation/error.h" #include "wsfs/provider/operation/error.h"
#include "wsfs/provider/request.h" #include "wsfs/provider/request.h"
#include "wsfs/util.h" #include "wsfs/core/util.h"
void wsfsp_getattr( void wsfsp_getattr(

View File

@ -3,7 +3,7 @@
#include <stdbool.h> #include <stdbool.h>
#include "wsfs/provider/operation/error.h" #include "wsfs/provider/operation/error.h"
#include "wsfs/util.h" #include "wsfs/core/util.h"
void wsfsp_lookup( void wsfsp_lookup(
struct wsfsp_invokation_context * context, struct wsfsp_invokation_context * context,

View File

@ -1,7 +1,7 @@
#include "wsfs/provider/operation/open_intern.h" #include "wsfs/provider/operation/open_intern.h"
#include "wsfs/provider/operation/error.h" #include "wsfs/provider/operation/error.h"
#include "wsfs/provider/request.h" #include "wsfs/provider/request.h"
#include "wsfs/util.h" #include "wsfs/core/util.h"
void wsfsp_open( void wsfsp_open(
struct wsfsp_invokation_context * context, struct wsfsp_invokation_context * context,

View File

@ -4,7 +4,7 @@
#include <libwebsockets.h> #include <libwebsockets.h>
#include "wsfs/provider/operation/error.h" #include "wsfs/provider/operation/error.h"
#include "wsfs/util.h" #include "wsfs/core/util.h"
void wsfsp_read( void wsfsp_read(
struct wsfsp_invokation_context * context, struct wsfsp_invokation_context * context,

View File

@ -2,7 +2,7 @@
#include "wsfs/provider/operation/error.h" #include "wsfs/provider/operation/error.h"
#include "wsfs/provider/dirbuffer_intern.h" #include "wsfs/provider/dirbuffer_intern.h"
#include "wsfs/provider/request.h" #include "wsfs/provider/request.h"
#include "wsfs/util.h" #include "wsfs/core/util.h"
void wsfsp_readdir( void wsfsp_readdir(
struct wsfsp_invokation_context * context, struct wsfsp_invokation_context * context,