adding string heap and sroot=%s option

[rrq/fuse_xattrs.git] / passthrough.c

diff --git a/passthrough.c b/passthrough.c
index b827da98968c4645bae6b7bbfb919df3c39b94f5..6d00593c7993853c4840bd0d7d9e53dab17984f1 100644 (file)
--- a/passthrough.c
+++ b/passthrough.c
@@ -29,6 +29,7 @@
 
 #include "xattrs_config.h"
 #include "utils.h"
+#include "stringmem.h"
 
 int xmp_getattr(const char *path, struct stat *stbuf) {
     int res;
@@ -39,7 +40,7 @@ int xmp_getattr(const char *path, struct stat *stbuf) {
 
     char *_path = prepend_source_directory(path);
     res = lstat(_path, stbuf);
-    free(_path);
+    strfree(_path);
 
     if (res == -1)
         return -errno;
@@ -55,7 +56,7 @@ int xmp_access(const char *path, int mask) {
 
     char *_path = prepend_source_directory(path);
     res = access(_path, mask);
-    free(_path);
+    strfree(_path);
 
     if (res == -1)
         return -errno;
@@ -71,7 +72,7 @@ int xmp_readlink(const char *path, char *buf, size_t size) {
 
     char *_path = prepend_source_directory(path);
     res = readlink(_path, buf, size - 1);
-    free(_path);
+    strfree(_path);
 
     if (res == -1)
         return -errno;
@@ -93,7 +94,7 @@ int xmp_readdir(const char *path, void *buf, fuse_fill_dir_t filler,
     } else {
         char *_path = prepend_source_directory(path);
         dp = opendir(_path);
-        free(_path);
+        strfree(_path);
     }
 
     if (dp == NULL)
@@ -135,7 +136,7 @@ int xmp_mknod(const char *path, mode_t mode, dev_t rdev) {
     else
         res = mknod(_path, mode, rdev);
 
-    free(_path);
+    strfree(_path);
     if (res == -1)
         return -errno;
 
@@ -150,7 +151,7 @@ int xmp_mkdir(const char *path, mode_t mode) {
 
     char *_path = prepend_source_directory(path);
     res = mkdir(_path, mode);
-    free(_path);
+    strfree(_path);
 
     if (res == -1)
         return -errno;
@@ -168,7 +169,7 @@ int xmp_unlink(const char *path) {
     res = unlink(_path);
 
     if (res == -1) {
-        free(_path);
+        strfree(_path);
         return -errno;
     }
 
@@ -178,8 +179,8 @@ int xmp_unlink(const char *path) {
             error_print("Error removing sidecar file: %s\n", sidecar_path);
         }
     }
-    free(sidecar_path);
-    free(_path);
+    strfree(sidecar_path);
+    strfree(_path);
 
     return 0;
 }
@@ -193,7 +194,7 @@ int xmp_rmdir(const char *path) {
 
     char *_path = prepend_source_directory(path);
     res = rmdir(_path);
-    free(_path);
+    strfree(_path);
 
     if (res == -1)
         return -errno;
@@ -211,7 +212,7 @@ int xmp_symlink(const char *from, const char *to) {
 
     char *_to = prepend_source_directory(to);
     res = symlink(from, _to);
-    free(_to);
+    strfree(_to);
 
     if (res == -1)
         return -errno;
@@ -232,8 +233,8 @@ int xmp_rename(const char *from, const char *to) {
     res = rename(_from, _to);
 
     if (res == -1) {
-        free(_from);
-        free(_to);
+        strfree(_from);
+        strfree(_to);
         return -errno;
     }
 
@@ -246,11 +247,11 @@ int xmp_rename(const char *from, const char *to) {
             error_print("Error renaming sidecar. from: %s to: %s\n", from_sidecar_path, to_sidecar_path);
         }
     }
-    free(from_sidecar_path);
-    free(to_sidecar_path);
+    strfree(from_sidecar_path);
+    strfree(to_sidecar_path);
 
-    free(_from);
-    free(_to);
+    strfree(_from);
+    strfree(_to);
 
     return 0;
 }
@@ -267,8 +268,8 @@ int xmp_link(const char *from, const char *to) {
     char *_from = prepend_source_directory(from);
     char *_to = prepend_source_directory(to);
     res = link(_from, _to);
-    free(_from);
-    free(_to);
+    strfree(_from);
+    strfree(_to);
 
     if (res == -1)
         return -errno;
@@ -284,7 +285,7 @@ int xmp_chmod(const char *path, mode_t mode) {
 
     char *_path = prepend_source_directory(path);
     res = chmod(_path, mode);
-    free(_path);
+    strfree(_path);
 
     if (res == -1)
         return -errno;
@@ -300,7 +301,7 @@ int xmp_chown(const char *path, uid_t uid, gid_t gid) {
 
     char *_path = prepend_source_directory(path);
     res = lchown(_path, uid, gid);
-    free(_path);
+    strfree(_path);
 
     if (res == -1)
         return -errno;
@@ -316,7 +317,7 @@ int xmp_truncate(const char *path, off_t size) {
 
     char *_path = prepend_source_directory(path);
     res = truncate(_path, size);
-    free(_path);
+    strfree(_path);
 
     if (res == -1)
         return -errno;
@@ -325,20 +326,17 @@ int xmp_truncate(const char *path, off_t size) {
 }
 
 #ifdef HAVE_UTIMENSAT
-int xmp_utimens(const char *path, const struct timespec ts[2],
-struct fuse_file_info *fi)
-{
+int xmp_utimens(const char *path, const struct timespec ts[2]) {
     if (xattrs_config.show_sidecar == 0 && filename_is_sidecar(path) == 1)  {
         return -ENOENT;
     }
 
-    (void) fi;
     int res;
 
     char *_path = prepend_source_directory(path);
     /* don't use utime/utimes since they follow symlinks */
     res = utimensat(0, _path, ts, AT_SYMLINK_NOFOLLOW);
-    free(_path);
+    strfree(_path);
     if (res == -1)
         return -errno;
 
@@ -354,7 +352,7 @@ int xmp_open(const char *path, struct fuse_file_info *fi) {
 
     char *_path = prepend_source_directory(path);
     fd = open(_path, fi->flags);
-    free(_path);
+    strfree(_path);
 
     if (fd == -1)
         return -errno;
@@ -401,7 +399,7 @@ int xmp_statfs(const char *path, struct statvfs *stbuf) {
 
     char *_path = prepend_source_directory(path);
     res = statvfs(_path, stbuf);
-    free(_path);
+    strfree(_path);
 
     if (res == -1)
         return -errno;