X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=passthrough.c;h=6d00593c7993853c4840bd0d7d9e53dab17984f1;hb=HEAD;hp=4b1ab7e66d78c1a4c2a58901878083b984673e79;hpb=c2151710dfb6f6ebe0134477198265e67142101b;p=rrq%2Ffuse_xattrs.git

diff --git a/passthrough.c b/passthrough.c
index 4b1ab7e..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;
@@ -32,9 +38,9 @@ int xmp_getattr(const char *path, struct stat *stbuf) {
         return -ENOENT;
     }
 
-    char *_path = prepend_source_directory(xattrs_config.source_dir, path);
+    char *_path = prepend_source_directory(path);
     res = lstat(_path, stbuf);
-    free(_path);
+    strfree(_path);
 
     if (res == -1)
         return -errno;
@@ -48,9 +54,9 @@ int xmp_access(const char *path, int mask) {
         return -ENOENT;
     }
 
-    char *_path = prepend_source_directory(xattrs_config.source_dir, path);
+    char *_path = prepend_source_directory(path);
     res = access(_path, mask);
-    free(_path);
+    strfree(_path);
 
     if (res == -1)
         return -errno;
@@ -64,9 +70,9 @@ int xmp_readlink(const char *path, char *buf, size_t size) {
         return -ENOENT;
     }
 
-    char *_path = prepend_source_directory(xattrs_config.source_dir, path);
+    char *_path = prepend_source_directory(path);
     res = readlink(_path, buf, size - 1);
-    free(_path);
+    strfree(_path);
 
     if (res == -1)
         return -errno;
@@ -82,11 +88,14 @@ int xmp_readdir(const char *path, void *buf, fuse_fill_dir_t filler,
     struct dirent *de;
 
     (void) offset;
-    (void) fi;
 
-    char *_path = prepend_source_directory(xattrs_config.source_dir, path);
-    dp = opendir(_path);
-    free(_path);
+    if (fi != NULL && fi->fh != 0) {
+        dp = fdopendir(fi->fh);
+    } else {
+        char *_path = prepend_source_directory(path);
+        dp = opendir(_path);
+        strfree(_path);
+    }
 
     if (dp == NULL)
         return -errno;
@@ -114,7 +123,7 @@ int xmp_mknod(const char *path, mode_t mode, dev_t rdev) {
         return -ENOENT;
     }
 
-    char *_path = prepend_source_directory(xattrs_config.source_dir, path);
+    char *_path = prepend_source_directory(path);
 
     /* On Linux this could just be 'mknod(path, mode, rdev)' but this
        is more portable */
@@ -127,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;
 
@@ -140,9 +149,9 @@ int xmp_mkdir(const char *path, mode_t mode) {
         return -ENOENT;
     }
 
-    char *_path = prepend_source_directory(xattrs_config.source_dir, path);
+    char *_path = prepend_source_directory(path);
     res = mkdir(_path, mode);
-    free(_path);
+    strfree(_path);
 
     if (res == -1)
         return -errno;
@@ -156,25 +165,36 @@ int xmp_unlink(const char *path) {
         return -ENOENT;
     }
 
-    char *_path = prepend_source_directory(xattrs_config.source_dir, 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)  {
         return -ENOENT;
     }
 
-    char *_path = prepend_source_directory(xattrs_config.source_dir, path);
+    char *_path = prepend_source_directory(path);
     res = rmdir(_path);
-    free(_path);
+    strfree(_path);
 
     if (res == -1)
         return -errno;
@@ -190,9 +210,9 @@ int xmp_symlink(const char *from, const char *to) {
         }
     }
 
-    char *_to = prepend_source_directory(xattrs_config.source_dir, to);
+    char *_to = prepend_source_directory(to);
     res = symlink(from, _to);
-    free(_to);
+    strfree(_to);
 
     if (res == -1)
         return -errno;
@@ -208,18 +228,35 @@ int xmp_rename(const char *from, const char *to) {
         }
     }
 
-    char *_from = prepend_source_directory(xattrs_config.source_dir, from);
-    char *_to = prepend_source_directory(xattrs_config.source_dir, 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) {
@@ -228,11 +265,11 @@ int xmp_link(const char *from, const char *to) {
         }
     }
 
-    char *_from = prepend_source_directory(xattrs_config.source_dir, from);
-    char *_to = prepend_source_directory(xattrs_config.source_dir, 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;
@@ -246,9 +283,9 @@ int xmp_chmod(const char *path, mode_t mode) {
         return -ENOENT;
     }
 
-    char *_path = prepend_source_directory(xattrs_config.source_dir, path);
+    char *_path = prepend_source_directory(path);
     res = chmod(_path, mode);
-    free(_path);
+    strfree(_path);
 
     if (res == -1)
         return -errno;
@@ -262,9 +299,9 @@ int xmp_chown(const char *path, uid_t uid, gid_t gid) {
         return -ENOENT;
     }
 
-    char *_path = prepend_source_directory(xattrs_config.source_dir, path);
+    char *_path = prepend_source_directory(path);
     res = lchown(_path, uid, gid);
-    free(_path);
+    strfree(_path);
 
     if (res == -1)
         return -errno;
@@ -278,9 +315,9 @@ int xmp_truncate(const char *path, off_t size) {
         return -ENOENT;
     }
 
-    char *_path = prepend_source_directory(xattrs_config.source_dir, path);
+    char *_path = prepend_source_directory(path);
     res = truncate(_path, size);
-    free(_path);
+    strfree(_path);
 
     if (res == -1)
         return -errno;
@@ -289,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(xattrs_config.source_dir, path);
+    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;
 
@@ -311,71 +345,49 @@ struct fuse_file_info *fi)
 #endif
 
 int xmp_open(const char *path, struct fuse_file_info *fi) {
-    int res;
+    int fd;
     if (xattrs_config.show_sidecar == 0 && filename_is_sidecar(path) == 1)  {
         return -ENOENT;
     }
 
-    char *_path = prepend_source_directory(xattrs_config.source_dir, path);
-    res = open(_path, fi->flags);
-    free(_path);
+    char *_path = prepend_source_directory(path);
+    fd = open(_path, fi->flags);
+    strfree(_path);
 
-    if (res == -1)
+    if (fd == -1)
         return -errno;
 
-    close(res);
+    fi->fh = fd;
     return 0;
 }
 
 int xmp_read(const char *path, char *buf, size_t size, off_t offset,
              struct fuse_file_info *fi)
 {
-    if (xattrs_config.show_sidecar == 0 && filename_is_sidecar(path) == 1)  {
-        return -ENOENT;
+    (void) path;
+    if (fi == NULL || fi->fh == 0) {
+        return -1;
     }
 
-    int fd;
-    int res;
-
-    (void) fi;
-    char *_path = prepend_source_directory(xattrs_config.source_dir, path);
-    fd = open(_path, O_RDONLY);
-    free(_path);
-
-    if (fd == -1)
-        return -errno;
-
-    res = pread(fd, buf, size, offset);
+    int res = pread(fi->fh, buf, size, offset);
     if (res == -1)
         res = -errno;
 
-    close(fd);
     return res;
 }
 
 int xmp_write(const char *path, const char *buf, size_t size,
               off_t offset, struct fuse_file_info *fi)
 {
-    if (xattrs_config.show_sidecar == 0 && filename_is_sidecar(path) == 1)  {
-        return -ENOENT;
+    (void) path;
+    if (fi == NULL || fi->fh == 0) {
+        return -1;
     }
 
-    int fd;
-    int res;
-
-    (void) fi;
-    char *_path = prepend_source_directory(xattrs_config.source_dir, path);
-    fd = open(_path, O_WRONLY);
-    free(_path);
-
-    if (fd == -1)
-        return -errno;
-
-    res = pwrite(fd, buf, size, offset);
+    int res = pwrite(fi->fh, buf, size, offset);
     if (res == -1)
         res = -errno;
 
-    close(fd);
     return res;
 }
 
@@ -385,9 +397,9 @@ int xmp_statfs(const char *path, struct statvfs *stbuf) {
         return -ENOENT;
     }
 
-    char *_path = prepend_source_directory(xattrs_config.source_dir, path);
+    char *_path = prepend_source_directory(path);
     res = statvfs(_path, stbuf);
-    free(_path);
+    strfree(_path);
 
     if (res == -1)
         return -errno;
@@ -396,12 +408,8 @@ int xmp_statfs(const char *path, struct statvfs *stbuf) {
 }
 
 int xmp_release(const char *path, struct fuse_file_info *fi) {
-    /* Just a stub.	 This method is optional and can safely be left
-       unimplemented */
-
     (void) path;
-    (void) fi;
-    return 0;
+    return close(fi->fh);
 }
 
 int xmp_fsync(const char *path, int isdatasync,
@@ -419,28 +427,16 @@ int xmp_fsync(const char *path, int isdatasync,
 int xmp_fallocate(const char *path, int mode,
                   off_t offset, off_t length, struct fuse_file_info *fi)
 {
-    if (xattrs_config.show_sidecar == 0 && filename_is_sidecar(path) == 1)  {
-        return -ENOENT;
+    (void) path;
+    if (fi == NULL || fi->fh == 0) {
+        return -1;
     }
 
-    int fd;
     int res;
-
-    (void) fi;
-
     if (mode)
         return -EOPNOTSUPP;
 
-    char *_path = concat(xattrs_config.source_dir, path);
-    fd = open(_path, O_WRONLY);
-    free(_path);
-
-    if (fd == -1)
-        return -errno;
-
-    res = -posix_fallocate(fd, offset, length);
-
-    close(fd);
+    res = -posix_fallocate(fi->fh, offset, length);
     return res;
 }
 #endif