X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=fuse_xattrs.c;h=242e1717f1d27e43aeda694e77e260ba7dd6eeb3;hb=bf2ad3a677c948b2bc975a56d444a4f901497894;hp=610ad4a13ec1a19dd51730dd60215d697f408c69;hpb=b0063ac38ae833b543d7301f34ed19e559f7fe49;p=rrq%2Ffuse_xattrs.git

diff --git a/fuse_xattrs.c b/fuse_xattrs.c
index 610ad4a..242e171 100644
--- a/fuse_xattrs.c
+++ b/fuse_xattrs.c
@@ -21,6 +21,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <stddef.h>
 
 #include <fuse.h>
 #include <sys/xattr.h>
@@ -35,6 +36,10 @@
 
 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) {
         debug_print("Only user namespace is supported. name=%s\n", name);
         return -ENOTSUP;
@@ -48,7 +53,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);
@@ -66,6 +71,10 @@ 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 (xattrs_config.show_sidecar == 0 && filename_is_sidecar(path) == 1)  {
+        return -ENOENT;
+    }
+
     if (get_namespace(name) != USER) {
         debug_print("Only user namespace is supported. name=%s\n", name);
         return -ENOTSUP;
@@ -75,7 +84,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);
@@ -85,12 +94,16 @@ static int xmp_getxattr(const char *path, const char *name, char *value, size_t
 
 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);
@@ -100,6 +113,10 @@ static int xmp_listxattr(const char *path, char *list, size_t size)
 
 static int xmp_removexattr(const char *path, const char *name)
 {
+    if (xattrs_config.show_sidecar == 0 && filename_is_sidecar(path) == 1)  {
+        return -ENOENT;
+    }
+
     if (get_namespace(name) != USER) {
         debug_print("Only user namespace is supported. name=%s\n", name);
         return -ENOTSUP;
@@ -109,7 +126,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);
@@ -150,36 +167,6 @@ static struct fuse_operations xmp_oper = {
         .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.
@@ -222,6 +209,23 @@ 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_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;
@@ -229,6 +233,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;
@@ -243,6 +248,7 @@ 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"
                             "\n", outargs->argv[0]);
 
             fuse_opt_add_arg(outargs, "-ho");
@@ -273,5 +279,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);
 }