X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;ds=sidebyside;f=utils.c;h=f245e7e3e84849b0a62d57a9c5dd09ff872749bb;hb=717036c0ae228c0ea13a6bdf6b473fbb981d91dd;hp=1a05447a43f7e01211dec229a9cbf343a6e25958;hpb=5c2c6d3286e691f8a5b61bc2d83b9cc07bb18e9d;p=rrq%2Ffuse_xattrs.git

diff --git a/utils.c b/utils.c
index 1a05447..f245e7e 100644
--- a/utils.c
+++ b/utils.c
@@ -12,7 +12,7 @@
 #include <string.h>
 
 #include "utils.h"
-#include "const.h"
+#include "fuse_xattrs_config.h"
 
 char *prepend_source_directory(const char *a, const char *b) {
     size_t len = strlen(a) + strlen(b) + 1;
@@ -25,12 +25,12 @@ char *prepend_source_directory(const char *a, const char *b) {
 char *get_sidecar_path(const char *path)
 {
     const size_t path_len = strlen(path);
-    const size_t sidecar_ext_len = strlen(SIDECAR_EXT); // this can be optimized
+    const size_t sidecar_ext_len = strlen(BINARY_SIDECAR_EXT); // this can be optimized
     const size_t sidecar_path_len = path_len + sidecar_ext_len + 1;
     char *sidecar_path = (char *) malloc(sidecar_path_len);
     memset(sidecar_path, '\0', sidecar_path_len);
     memcpy(sidecar_path, path, path_len);
-    memcpy(sidecar_path + path_len, SIDECAR_EXT, sidecar_ext_len);
+    memcpy(sidecar_path + path_len, BINARY_SIDECAR_EXT, sidecar_ext_len);
 
     return sidecar_path;
 }
@@ -44,20 +44,50 @@ char *sanitize_value(const char *value, size_t value_size)
     return sanitized;
 }
 
+
+const size_t BINARY_SIDECAR_EXT_SIZE = strlen(BINARY_SIDECAR_EXT);
+
+const int filename_is_sidecar(const char *string) {
+    if(string == NULL)
+        return 0;
+
+    size_t size = strlen(string);
+    if (size <= BINARY_SIDECAR_EXT_SIZE)
+        return 0;
+
+    if (memcmp(string+size-BINARY_SIDECAR_EXT_SIZE, BINARY_SIDECAR_EXT, BINARY_SIDECAR_EXT_SIZE) == 0) {
+        return 1;
+    }
+
+    return 0;
+}
+
+#define USER_NAMESPACE "user."
+#define SYSTEM_NAMESPACE "system."
+#define SECURITY_NAMESPACE "security."
+#define TRUSTED_NAMESPACE "trusted."
+
+const size_t USER_NAMESPACE_SIZE     = strlen(USER_NAMESPACE);
+const size_t SYSTEM_NAMESPACE_SIZE   = strlen(SYSTEM_NAMESPACE);
+const size_t SECURITY_NAMESPACE_SIZE = strlen(SECURITY_NAMESPACE);
+const size_t THRUSTED_NAMESPACE_SIZE = strlen(TRUSTED_NAMESPACE);
+
 enum namespace get_namespace(const char *name) {
-    if (strncmp(name, "user.", strlen("user.")) == 0) {
+    size_t name_size = strlen(name);
+
+    if (name_size > USER_NAMESPACE_SIZE && memcmp(name, USER_NAMESPACE, USER_NAMESPACE_SIZE) == 0) {
         return USER;
     }
 
-    if (strncmp(name, "system.", strlen("system.")) == 0) {
+    if (name_size > SYSTEM_NAMESPACE_SIZE && memcmp(name, SYSTEM_NAMESPACE, SYSTEM_NAMESPACE_SIZE) == 0) {
         return SYSTEM;
     }
 
-    if (strncmp(name, "security.", strlen("security.")) == 0) {
+    if (name_size > SECURITY_NAMESPACE_SIZE && memcmp(name, SECURITY_NAMESPACE, SECURITY_NAMESPACE_SIZE) == 0) {
         return SECURITY;
     }
 
-    if (strncmp(name, "trusted.", strlen("trusted.")) == 0) {
+    if (name_size > THRUSTED_NAMESPACE_SIZE && memcmp(name, TRUSTED_NAMESPACE, THRUSTED_NAMESPACE_SIZE) == 0) {
         return TRUSTED;
     }