bugfix: binary_storage: check before writing a key with an empty value. Added test.

[rrq/fuse_xattrs.git] / passthrough.c

diff --git a/passthrough.c b/passthrough.c
index 3f554905a67e721fa095a6333f8ca0ad01706692..cacc6b49e93f8730c5846dfdf6950bb06ecee45d 100644 (file)
--- a/passthrough.c
+++ b/passthrough.c
@@ -82,11 +82,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(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);
+        free(_path);
+    }
 
     if (dp == NULL)
         return -errno;
@@ -158,14 +161,25 @@ int xmp_unlink(const char *path) {
 
     char *_path = prepend_source_directory(path);
     res = unlink(_path);
-    free(_path);
 
-    if (res == -1)
+    if (res == -1) {
+        free(_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);
+        }
+    }
+    free(sidecar_path);
+    free(_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)  {
@@ -211,15 +225,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) {
+        free(_from);
+        free(_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);
+        }
+    }
+    free(from_sidecar_path);
+    free(to_sidecar_path);
+
+    free(_from);
+    free(_to);
 
     return 0;
 }
 
+// TODO: handle sidecar file ?
 int xmp_link(const char *from, const char *to) {
     int res;
     if (xattrs_config.show_sidecar == 0) {
@@ -311,71 +342,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(path);
-    res = open(_path, fi->flags);
+    fd = open(_path, fi->flags);
     free(_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(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(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;
 }
 
@@ -396,12 +405,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 +424,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 = prepend_source_directory(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