X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=fuse_xattrs.c;h=fe5637071b0daae80bb952b9f17cd43fc2fd0695;hb=e27cfd61758919ea198da7e51eecfac7598579e5;hp=84007f7fe7990482c012a89f11d9172d19f6ab2c;hpb=5c2c6d3286e691f8a5b61bc2d83b9cc07bb18e9d;p=rrq%2Ffuse_xattrs.git diff --git a/fuse_xattrs.c b/fuse_xattrs.c index 84007f7..fe56370 100644 --- a/fuse_xattrs.c +++ b/fuse_xattrs.c @@ -1,7 +1,7 @@ /* fuse_xattrs - Add xattrs support using sidecar files - Copyright (C) 2016 Felipe Barriga Richards + Copyright (C) 2016-2017 Felipe Barriga Richards Based on passthrough.c (libfuse example) @@ -14,27 +14,39 @@ /* For pread()/pwrite()/utimensat() */ #define _XOPEN_SOURCE 700 -/* For get_current_dir_name */ -#define _GNU_SOURCE - #include #include #include #include +#include +#include + +#ifdef __APPLE__ + #include +#else + #include +#endif -#include #include +#include +#include "fuse_xattrs_config.h" + +#include "xattrs_config.h" #include "utils.h" #include "passthrough.h" -#include "fuse_xattrs_config.h" #include "binary_storage.h" -#include "const.h" + +struct xattrs_config xattrs_config; static int xmp_setxattr(const char *path, const char *name, const char *value, size_t size, int flags) { - if (get_namespace(name) != USER) { + if (xattrs_config.show_sidecar == 0 && filename_is_sidecar(path) == 1) { + return -ENOENT; + } + + if (xattrs_config.enable_namespaces == 1 && get_namespace(name) != USER) { debug_print("Only user namespace is supported. name=%s\n", name); return -ENOTSUP; } @@ -47,7 +59,7 @@ static int xmp_setxattr(const char *path, const char *name, const char *value, s return -ENOSPC; } - char *_path = prepend_source_directory(xattrs_config.source_dir, path); + char *_path = prepend_source_directory(path); #ifdef DEBUG char *sanitized_value = sanitize_value(value, size); @@ -65,7 +77,11 @@ static int xmp_setxattr(const char *path, const char *name, const char *value, s static int xmp_getxattr(const char *path, const char *name, char *value, size_t size) { - if (get_namespace(name) != USER) { + if (xattrs_config.show_sidecar == 0 && filename_is_sidecar(path) == 1) { + return -ENOENT; + } + + if (xattrs_config.enable_namespaces == 1 && get_namespace(name) != USER) { debug_print("Only user namespace is supported. name=%s\n", name); return -ENOTSUP; } @@ -74,7 +90,7 @@ static int xmp_getxattr(const char *path, const char *name, char *value, size_t return -ERANGE; } - char *_path = prepend_source_directory(xattrs_config.source_dir, path); + char *_path = prepend_source_directory(path); debug_print("path=%s name=%s size=%zu\n", _path, name, size); int rtval = binary_storage_read_key(_path, name, value, size); free(_path); @@ -82,14 +98,30 @@ static int xmp_getxattr(const char *path, const char *name, char *value, size_t return rtval; } +#ifdef __APPLE__ + static int xmp_setxattr_apple(const char *path, const char *name, const char *value, size_t size, int flags, u_int32_t position) { + assert(position == 0); + return xmp_setxattr(path, name, value, size, flags); + } + + static int xmp_getxattr_apple(const char *path, const char *name, char *value, size_t size, u_int32_t position) { + assert(position == 0); + return xmp_getxattr(path, name, value, size); + } +#endif + static int xmp_listxattr(const char *path, char *list, size_t size) { + if (xattrs_config.show_sidecar == 0 && filename_is_sidecar(path) == 1) { + return -ENOENT; + } + if (size > XATTR_LIST_MAX) { debug_print("The size of the list of attribute names for this file exceeds the system-imposed limit.\n"); return -E2BIG; } - char *_path = prepend_source_directory(xattrs_config.source_dir, path); + char *_path = prepend_source_directory(path); debug_print("path=%s size=%zu\n", _path, size); int rtval = binary_storage_list_keys(_path, list, size); free(_path); @@ -99,7 +131,11 @@ static int xmp_listxattr(const char *path, char *list, size_t size) static int xmp_removexattr(const char *path, const char *name) { - if (get_namespace(name) != USER) { + if (xattrs_config.show_sidecar == 0 && filename_is_sidecar(path) == 1) { + return -ENOENT; + } + + if (xattrs_config.enable_namespaces == 1 && get_namespace(name) != USER) { debug_print("Only user namespace is supported. name=%s\n", name); return -ENOTSUP; } @@ -108,7 +144,7 @@ static int xmp_removexattr(const char *path, const char *name) return -ERANGE; } - char *_path = prepend_source_directory(xattrs_config.source_dir, path); + char *_path = prepend_source_directory(path); debug_print("path=%s name=%s\n", _path, name); int rtval = binary_storage_remove_key(_path, name); free(_path); @@ -143,42 +179,17 @@ static struct fuse_operations xmp_oper = { #ifdef HAVE_POSIX_FALLOCATE .fallocate = xmp_fallocate, #endif +#ifdef __APPLE__ + .setxattr = xmp_setxattr_apple, + .getxattr = xmp_getxattr_apple, +#else .setxattr = xmp_setxattr, .getxattr = xmp_getxattr, +#endif .listxattr = xmp_listxattr, .removexattr = xmp_removexattr, }; - -enum { - KEY_HELP, - KEY_VERSION, -}; - - -static struct fuse_opt xattrs_opts[] = { - FUSE_OPT_KEY("-V", KEY_VERSION), - FUSE_OPT_KEY("--version", KEY_VERSION), - FUSE_OPT_KEY("-h", KEY_HELP), - FUSE_OPT_KEY("--help", KEY_HELP), - FUSE_OPT_END -}; - -int is_directory(const char *path) { - struct stat statbuf; - if (stat(path, &statbuf) != 0) { - fprintf(stderr, "cannot get source directory status: %s\n", path); - return -1; - } - - if (!S_ISDIR(statbuf.st_mode)) { - fprintf(stderr, "source directory must be a directory: %s\n", path); - return -1; - } - - return 1; -} - /** * Check if the path is valid. If it's a relative path, * prepend the working path. @@ -200,7 +211,8 @@ const char *sanitized_source_directory(const char *path) { return absolute_path; } - char *pwd = get_current_dir_name(); + static char cwd[MAXPATHLEN]; + char *pwd = getcwd(cwd, sizeof(cwd)); size_t len = strlen(pwd) + 1 + strlen(path) + 1; int has_trailing_backslash = (path[strlen(path)-1] == '/'); if (!has_trailing_backslash) @@ -221,6 +233,24 @@ const char *sanitized_source_directory(const char *path) { return absolute_path; } +enum { + KEY_HELP, + KEY_VERSION, +}; + +#define FUSE_XATTRS_OPT(t, p, v) { t, offsetof(struct xattrs_config, p), v } + +static struct fuse_opt xattrs_opts[] = { + FUSE_XATTRS_OPT("show_sidecar", show_sidecar, 1), + FUSE_XATTRS_OPT("enable_namespaces", enable_namespaces, 1), + + FUSE_OPT_KEY("-V", KEY_VERSION), + FUSE_OPT_KEY("--version", KEY_VERSION), + FUSE_OPT_KEY("-h", KEY_HELP), + FUSE_OPT_KEY("--help", KEY_HELP), + FUSE_OPT_END +}; + static int xattrs_opt_proc(void *data, const char *arg, int key, struct fuse_args *outargs) { (void) data; @@ -228,6 +258,7 @@ static int xattrs_opt_proc(void *data, const char *arg, int key, case FUSE_OPT_KEY_NONOPT: if (!xattrs_config.source_dir) { xattrs_config.source_dir = sanitized_source_directory(arg); + xattrs_config.source_dir_size = strlen(xattrs_config.source_dir); return 0; } break; @@ -242,6 +273,8 @@ static int xattrs_opt_proc(void *data, const char *arg, int key, " -V --version print version\n" "\n" "FUSE XATTRS options:\n" + " -o show_sidecar don't hide sidecar files\n" + " -o enable_namespaces enable namespaces checks\n" "\n", outargs->argv[0]); fuse_opt_add_arg(outargs, "-ho"); @@ -249,6 +282,7 @@ static int xattrs_opt_proc(void *data, const char *arg, int key, exit(1); case KEY_VERSION: + printf("FUSE_XATTRS version %d.%d\n", FUSE_XATTRS_VERSION_MAJOR, FUSE_XATTRS_VERSION_MINOR); fuse_opt_add_arg(outargs, "--version"); fuse_main(outargs->argc, outargs->argv, &xmp_oper, NULL); exit(0); @@ -271,5 +305,8 @@ int main(int argc, char *argv[]) { } umask(0); + + // disable multi-threading + fuse_opt_add_arg(&args, "-s"); return fuse_main(args.argc, args.argv, &xmp_oper, NULL); }