adding string heap and sroot=%s option

[rrq/fuse_xattrs.git] / fuse_xattrs.c

diff --git a/fuse_xattrs.c b/fuse_xattrs.c
index 242e1717f1d27e43aeda694e77e260ba7dd6eeb3..01d4d26a6c8bd60cc165863ed113299f840b0812 100644 (file)
--- a/fuse_xattrs.c
+++ b/fuse_xattrs.c
@@ -14,33 +14,39 @@
 /* For pread()/pwrite()/utimensat() */
 #define _XOPEN_SOURCE 700
 
-/* For get_current_dir_name */
-#define _GNU_SOURCE
-
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <stddef.h>
+#include <assert.h>
+
+#ifdef __APPLE__
+    #include <osxfuse/fuse.h>
+#else
+    #include <fuse.h>
+#endif
 
-#include <fuse.h>
 #include <sys/xattr.h>
+#include <sys/param.h>
 
 #include "fuse_xattrs_config.h"
 
 #include "xattrs_config.h"
 #include "utils.h"
 #include "passthrough.h"
-
+#include "stringmem.h"
 #include "binary_storage.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 (xattrs_config.show_sidecar == 0 && filename_is_sidecar(path) == 1)  {
         return -ENOENT;
     }
 
-    if (get_namespace(name) != USER) {
+    if (xattrs_config.enable_namespaces == 1 && get_namespace(name) != USER) {
         debug_print("Only user namespace is supported. name=%s\n", name);
         return -ENOTSUP;
     }
@@ -60,11 +66,11 @@ static int xmp_setxattr(const char *path, const char *name, const char *value, s
     debug_print("path=%s name=%s value=%s size=%zu XATTR_CREATE=%d XATTR_REPLACE=%d\n",
                 _path, name, sanitized_value, size, flags & XATTR_CREATE, flags & XATTR_REPLACE);
 
-    free(sanitized_value);
+    strfree(sanitized_value);
 #endif
 
     int rtval = binary_storage_write_key(_path, name, value, size, flags);
-    free(_path);
+    strfree(_path);
 
     return rtval;
 }
@@ -75,7 +81,7 @@ static int xmp_getxattr(const char *path, const char *name, char *value, size_t
         return -ENOENT;
     }
 
-    if (get_namespace(name) != USER) {
+    if (xattrs_config.enable_namespaces == 1 && get_namespace(name) != USER) {
         debug_print("Only user namespace is supported. name=%s\n", name);
         return -ENOTSUP;
     }
@@ -87,11 +93,23 @@ static int xmp_getxattr(const char *path, const char *name, char *value, size_t
     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);
+    strfree(_path);
 
     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)  {
@@ -106,7 +124,7 @@ static int xmp_listxattr(const char *path, char *list, size_t size)
     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);
+    strfree(_path);
 
     return rtval;
 }
@@ -117,7 +135,7 @@ static int xmp_removexattr(const char *path, const char *name)
         return -ENOENT;
     }
 
-    if (get_namespace(name) != USER) {
+    if (xattrs_config.enable_namespaces == 1 && get_namespace(name) != USER) {
         debug_print("Only user namespace is supported. name=%s\n", name);
         return -ENOTSUP;
     }
@@ -129,11 +147,13 @@ static int xmp_removexattr(const char *path, const char *name)
     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);
+    strfree(_path);
 
     return rtval;
 }
 
+extern int xmp_utimens(const char *path, const struct timespec ts[2]);
+
 static struct fuse_operations xmp_oper = {
         .getattr     = xmp_getattr,
         .access      = xmp_access,
@@ -161,8 +181,13 @@ 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,
 };
@@ -188,7 +213,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)
@@ -202,7 +228,7 @@ const char *sanitized_source_directory(const char *path) {
         absolute_path[len-2] = '/';
 
     if (is_directory(absolute_path) == -1) {
-        free(absolute_path);
+        strfree(absolute_path);
         return NULL;
     }
 
@@ -217,7 +243,9 @@ enum {
 #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("show_sidecar",         show_sidecar,       1),
+        FUSE_XATTRS_OPT("enable_namespaces",    enable_namespaces,  1),
+       FUSE_XATTRS_OPT("sroot=%s", sidecar_dir, 0 ),
 
         FUSE_OPT_KEY("-V",                 KEY_VERSION),
         FUSE_OPT_KEY("--version",          KEY_VERSION),
@@ -249,6 +277,7 @@ static int xattrs_opt_proc(void *data, const char *arg, int key,
                             "\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");
@@ -272,6 +301,12 @@ int main(int argc, char *argv[]) {
         exit(1);
     }
 
+    if ( xattrs_config.sidecar_dir ) {
+       xattrs_config.sidecar_dir =
+           sanitized_source_directory( xattrs_config.sidecar_dir );
+       return 0;
+    }
+    
     if (!xattrs_config.source_dir) {
         fprintf(stderr, "missing source directory\n");
         fprintf(stderr, "see `%s -h' for usage\n", argv[0]);