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

diff --git a/passthrough.c b/passthrough.c
index b3827cc..cacc6b4 100644
--- a/passthrough.c
+++ b/passthrough.c
@@ -161,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)  {
@@ -214,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) {