X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=passthrough.c;h=6d00593c7993853c4840bd0d7d9e53dab17984f1;hb=a93f22e050e3bc971f341ab4580d39266713133b;hp=b3827ccd91e51d99a09c3c2220157a5b5f87662b;hpb=34c0a707db7b6d8099df2a08f580792f7ebaf07e;p=rrq%2Ffuse_xattrs.git

diff --git a/passthrough.c b/passthrough.c
index b3827cc..6d00593 100644
--- a/passthrough.c
+++ b/passthrough.c
@@ -14,7 +14,12 @@
 /* For pread()/pwrite()/utimensat() */
 #define _XOPEN_SOURCE 700
 
-#include <fuse.h>
+#ifdef __APPLE__
+    #include <osxfuse/fuse.h>
+#else
+    #include <fuse.h>
+#endif
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -24,6 +29,7 @@
 
 #include "xattrs_config.h"
 #include "utils.h"
+#include "stringmem.h"
 
 int xmp_getattr(const char *path, struct stat *stbuf) {
     int res;
@@ -34,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;
@@ -50,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;
@@ -66,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;
@@ -88,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)
@@ -130,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;
 
@@ -145,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;
@@ -161,14 +167,25 @@ int xmp_unlink(const char *path) {
 
     char *_path = prepend_source_directory(path);
     res = unlink(_path);
-    free(_path);
 
-    if (res == -1)
+    if (res == -1) {
+        strfree(_path);
         return -errno;
+    }
+
+    char *sidecar_path = get_sidecar_path(_path);
+    if (is_regular_file(sidecar_path)) {
+        if (unlink(sidecar_path) == -1) {
+            error_print("Error removing sidecar file: %s\n", sidecar_path);
+        }
+    }
+    strfree(sidecar_path);
+    strfree(_path);
 
     return 0;
 }
 
+// FIXME: remove sidecar
 int xmp_rmdir(const char *path) {
     int res;
     if (xattrs_config.show_sidecar == 0 && filename_is_sidecar(path) == 1)  {
@@ -177,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;
@@ -195,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;
@@ -214,15 +231,32 @@ int xmp_rename(const char *from, const char *to) {
     char *_from = prepend_source_directory(from);
     char *_to = prepend_source_directory(to);
     res = rename(_from, _to);
-    free(_from);
-    free(_to);
 
-    if (res == -1)
+    if (res == -1) {
+        strfree(_from);
+        strfree(_to);
         return -errno;
+    }
+
+    char *from_sidecar_path = get_sidecar_path(_from);
+    char *to_sidecar_path = get_sidecar_path(_to);
+
+    // FIXME: Remove to_sidecar_path if it exists ?
+    if (is_regular_file(from_sidecar_path)) {
+        if (rename(from_sidecar_path, to_sidecar_path) == -1) {
+            error_print("Error renaming sidecar. from: %s to: %s\n", from_sidecar_path, to_sidecar_path);
+        }
+    }
+    strfree(from_sidecar_path);
+    strfree(to_sidecar_path);
+
+    strfree(_from);
+    strfree(_to);
 
     return 0;
 }
 
+// TODO: handle sidecar file ?
 int xmp_link(const char *from, const char *to) {
     int res;
     if (xattrs_config.show_sidecar == 0) {
@@ -234,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;
@@ -251,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;
@@ -267,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;
@@ -283,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;
@@ -292,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;
 
@@ -321,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;
@@ -368,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;