X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=passthrough.c;h=3f554905a67e721fa095a6333f8ca0ad01706692;hb=af0aaaa2a3edc0634ebb0a32750df759ab3eb515;hp=97c178e3a7d80c05579397d396de536a3c447dce;hpb=3f472567bdd9bc3fbfd99b342ee29b25d5b553be;p=rrq%2Ffuse_xattrs.git

diff --git a/passthrough.c b/passthrough.c
index 97c178e..3f55490 100644
--- a/passthrough.c
+++ b/passthrough.c
@@ -1,7 +1,7 @@
 /*
   fuse_xattrs - Add xattrs support using sidecar files
 
-  Copyright (C) 2016  Felipe Barriga Richards <felipe {at} felipebarriga.cl>
+  Copyright (C) 2016-2017  Felipe Barriga Richards <felipe {at} felipebarriga.cl>
 
   Based on passthrough.c (libfuse example)
 
@@ -17,14 +17,25 @@
 #include <fuse.h>
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <dirent.h>
 #include <errno.h>
 
+#include "xattrs_config.h"
+#include "utils.h"
+
 int xmp_getattr(const char *path, struct stat *stbuf) {
     int res;
 
-    res = lstat(path, stbuf);
+    if (xattrs_config.show_sidecar == 0 && filename_is_sidecar(path) == 1)  {
+        return -ENOENT;
+    }
+
+    char *_path = prepend_source_directory(path);
+    res = lstat(_path, stbuf);
+    free(_path);
+
     if (res == -1)
         return -errno;
 
@@ -33,8 +44,14 @@ int xmp_getattr(const char *path, struct stat *stbuf) {
 
 int xmp_access(const char *path, int mask) {
     int res;
+    if (xattrs_config.show_sidecar == 0 && filename_is_sidecar(path) == 1)  {
+        return -ENOENT;
+    }
+
+    char *_path = prepend_source_directory(path);
+    res = access(_path, mask);
+    free(_path);
 
-    res = access(path, mask);
     if (res == -1)
         return -errno;
 
@@ -43,8 +60,14 @@ int xmp_access(const char *path, int mask) {
 
 int xmp_readlink(const char *path, char *buf, size_t size) {
     int res;
+    if (xattrs_config.show_sidecar == 0 && filename_is_sidecar(path) == 1)  {
+        return -ENOENT;
+    }
+
+    char *_path = prepend_source_directory(path);
+    res = readlink(_path, buf, size - 1);
+    free(_path);
 
-    res = readlink(path, buf, size - 1);
     if (res == -1)
         return -errno;
 
@@ -61,11 +84,18 @@ int xmp_readdir(const char *path, void *buf, fuse_fill_dir_t filler,
     (void) offset;
     (void) fi;
 
-    dp = opendir(path);
+    char *_path = prepend_source_directory(path);
+    dp = opendir(_path);
+    free(_path);
+
     if (dp == NULL)
         return -errno;
 
     while ((de = readdir(dp)) != NULL) {
+        if (xattrs_config.show_sidecar == 0 && filename_is_sidecar(de->d_name) == 1) {
+            continue;
+        }
+
         struct stat st;
         memset(&st, 0, sizeof(st));
         st.st_ino = de->d_ino;
@@ -80,17 +110,24 @@ int xmp_readdir(const char *path, void *buf, fuse_fill_dir_t filler,
 
 int xmp_mknod(const char *path, mode_t mode, dev_t rdev) {
     int res;
+    if (xattrs_config.show_sidecar == 0 && filename_is_sidecar(path) == 1)  {
+        return -ENOENT;
+    }
+
+    char *_path = prepend_source_directory(path);
 
     /* On Linux this could just be 'mknod(path, mode, rdev)' but this
        is more portable */
     if (S_ISREG(mode)) {
-        res = open(path, O_CREAT | O_EXCL | O_WRONLY, mode);
+        res = open(_path, O_CREAT | O_EXCL | O_WRONLY, mode);
         if (res >= 0)
             res = close(res);
     } else if (S_ISFIFO(mode))
-        res = mkfifo(path, mode);
+        res = mkfifo(_path, mode);
     else
-        res = mknod(path, mode, rdev);
+        res = mknod(_path, mode, rdev);
+
+    free(_path);
     if (res == -1)
         return -errno;
 
@@ -99,8 +136,14 @@ int xmp_mknod(const char *path, mode_t mode, dev_t rdev) {
 
 int xmp_mkdir(const char *path, mode_t mode) {
     int res;
+    if (xattrs_config.show_sidecar == 0 && filename_is_sidecar(path) == 1)  {
+        return -ENOENT;
+    }
+
+    char *_path = prepend_source_directory(path);
+    res = mkdir(_path, mode);
+    free(_path);
 
-    res = mkdir(path, mode);
     if (res == -1)
         return -errno;
 
@@ -109,8 +152,14 @@ int xmp_mkdir(const char *path, mode_t mode) {
 
 int xmp_unlink(const char *path) {
     int res;
+    if (xattrs_config.show_sidecar == 0 && filename_is_sidecar(path) == 1)  {
+        return -ENOENT;
+    }
+
+    char *_path = prepend_source_directory(path);
+    res = unlink(_path);
+    free(_path);
 
-    res = unlink(path);
     if (res == -1)
         return -errno;
 
@@ -119,8 +168,14 @@ int xmp_unlink(const char *path) {
 
 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(path);
+    res = rmdir(_path);
+    free(_path);
 
-    res = rmdir(path);
     if (res == -1)
         return -errno;
 
@@ -129,8 +184,16 @@ int xmp_rmdir(const char *path) {
 
 int xmp_symlink(const char *from, const char *to) {
     int res;
+    if (xattrs_config.show_sidecar == 0) {
+        if (filename_is_sidecar(from) == 1 || filename_is_sidecar(to)) {
+            return -ENOENT;
+        }
+    }
+
+    char *_to = prepend_source_directory(to);
+    res = symlink(from, _to);
+    free(_to);
 
-    res = symlink(from, to);
     if (res == -1)
         return -errno;
 
@@ -139,8 +202,18 @@ int xmp_symlink(const char *from, const char *to) {
 
 int xmp_rename(const char *from, const char *to) {
     int res;
+    if (xattrs_config.show_sidecar == 0) {
+        if (filename_is_sidecar(from) == 1 || filename_is_sidecar(to)) {
+            return -ENOENT;
+        }
+    }
+
+    char *_from = prepend_source_directory(from);
+    char *_to = prepend_source_directory(to);
+    res = rename(_from, _to);
+    free(_from);
+    free(_to);
 
-    res = rename(from, to);
     if (res == -1)
         return -errno;
 
@@ -149,8 +222,18 @@ int xmp_rename(const char *from, const char *to) {
 
 int xmp_link(const char *from, const char *to) {
     int res;
+    if (xattrs_config.show_sidecar == 0) {
+        if (filename_is_sidecar(from) == 1 || filename_is_sidecar(to)) {
+            return -ENOENT;
+        }
+    }
+
+    char *_from = prepend_source_directory(from);
+    char *_to = prepend_source_directory(to);
+    res = link(_from, _to);
+    free(_from);
+    free(_to);
 
-    res = link(from, to);
     if (res == -1)
         return -errno;
 
@@ -159,8 +242,14 @@ int xmp_link(const char *from, const char *to) {
 
 int xmp_chmod(const char *path, mode_t mode) {
     int res;
+    if (xattrs_config.show_sidecar == 0 && filename_is_sidecar(path) == 1)  {
+        return -ENOENT;
+    }
+
+    char *_path = prepend_source_directory(path);
+    res = chmod(_path, mode);
+    free(_path);
 
-    res = chmod(path, mode);
     if (res == -1)
         return -errno;
 
@@ -169,8 +258,14 @@ int xmp_chmod(const char *path, mode_t mode) {
 
 int xmp_chown(const char *path, uid_t uid, gid_t gid) {
     int res;
+    if (xattrs_config.show_sidecar == 0 && filename_is_sidecar(path) == 1)  {
+        return -ENOENT;
+    }
+
+    char *_path = prepend_source_directory(path);
+    res = lchown(_path, uid, gid);
+    free(_path);
 
-    res = lchown(path, uid, gid);
     if (res == -1)
         return -errno;
 
@@ -179,8 +274,14 @@ int xmp_chown(const char *path, uid_t uid, gid_t gid) {
 
 int xmp_truncate(const char *path, off_t size) {
     int res;
+    if (xattrs_config.show_sidecar == 0 && filename_is_sidecar(path) == 1)  {
+        return -ENOENT;
+    }
+
+    char *_path = prepend_source_directory(path);
+    res = truncate(_path, size);
+    free(_path);
 
-    res = truncate(path, size);
     if (res == -1)
         return -errno;
 
@@ -191,11 +292,17 @@ int xmp_truncate(const char *path, off_t size) {
 int xmp_utimens(const char *path, const struct timespec ts[2],
 struct fuse_file_info *fi)
 {
+    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);
+    res = utimensat(0, _path, ts, AT_SYMLINK_NOFOLLOW);
+    free(_path);
     if (res == -1)
         return -errno;
 
@@ -205,8 +312,14 @@ struct fuse_file_info *fi)
 
 int xmp_open(const char *path, struct fuse_file_info *fi) {
     int res;
+    if (xattrs_config.show_sidecar == 0 && filename_is_sidecar(path) == 1)  {
+        return -ENOENT;
+    }
+
+    char *_path = prepend_source_directory(path);
+    res = open(_path, fi->flags);
+    free(_path);
 
-    res = open(path, fi->flags);
     if (res == -1)
         return -errno;
 
@@ -215,12 +328,20 @@ int xmp_open(const char *path, struct fuse_file_info *fi) {
 }
 
 int xmp_read(const char *path, char *buf, size_t size, off_t offset,
-             struct fuse_file_info *fi) {
+             struct fuse_file_info *fi)
+{
+    if (xattrs_config.show_sidecar == 0 && filename_is_sidecar(path) == 1)  {
+        return -ENOENT;
+    }
+
     int fd;
     int res;
 
     (void) fi;
-    fd = open(path, O_RDONLY);
+    char *_path = prepend_source_directory(path);
+    fd = open(_path, O_RDONLY);
+    free(_path);
+
     if (fd == -1)
         return -errno;
 
@@ -233,12 +354,20 @@ int xmp_read(const char *path, char *buf, size_t size, off_t offset,
 }
 
 int xmp_write(const char *path, const char *buf, size_t size,
-              off_t offset, struct fuse_file_info *fi) {
+              off_t offset, struct fuse_file_info *fi)
+{
+    if (xattrs_config.show_sidecar == 0 && filename_is_sidecar(path) == 1)  {
+        return -ENOENT;
+    }
+
     int fd;
     int res;
 
     (void) fi;
-    fd = open(path, O_WRONLY);
+    char *_path = prepend_source_directory(path);
+    fd = open(_path, O_WRONLY);
+    free(_path);
+
     if (fd == -1)
         return -errno;
 
@@ -252,8 +381,14 @@ int xmp_write(const char *path, const char *buf, size_t size,
 
 int xmp_statfs(const char *path, struct statvfs *stbuf) {
     int res;
+    if (xattrs_config.show_sidecar == 0 && filename_is_sidecar(path) == 1)  {
+        return -ENOENT;
+    }
+
+    char *_path = prepend_source_directory(path);
+    res = statvfs(_path, stbuf);
+    free(_path);
 
-    res = statvfs(path, stbuf);
     if (res == -1)
         return -errno;
 
@@ -284,6 +419,10 @@ 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;
+    }
+
     int fd;
     int res;
 
@@ -292,7 +431,10 @@ int xmp_fallocate(const char *path, int mode,
     if (mode)
         return -EOPNOTSUPP;
 
-    fd = open(path, O_WRONLY);
+    char *_path = prepend_source_directory(path);
+    fd = open(_path, O_WRONLY);
+    free(_path);
+
     if (fd == -1)
         return -errno;