X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=passthrough.c;h=b827da98968c4645bae6b7bbfb919df3c39b94f5;hb=255958989d7774fa54d6287d5ab79511104e2acc;hp=95058833a371376d61204cd234965f87c3a8d5cd;hpb=5c2c6d3286e691f8a5b61bc2d83b9cc07bb18e9d;p=rrq%2Ffuse_xattrs.git diff --git a/passthrough.c b/passthrough.c index 9505883..b827da9 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 + Copyright (C) 2016-2017 Felipe Barriga Richards Based on passthrough.c (libfuse example) @@ -14,7 +14,12 @@ /* For pread()/pwrite()/utimensat() */ #define _XOPEN_SOURCE 700 -#include +#ifdef __APPLE__ + #include +#else + #include +#endif + #include #include #include @@ -22,13 +27,17 @@ #include #include -#include "fuse_xattrs_config.h" +#include "xattrs_config.h" #include "utils.h" int xmp_getattr(const char *path, struct stat *stbuf) { int res; - char *_path = prepend_source_directory(xattrs_config.source_dir, path); + 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); @@ -40,8 +49,11 @@ 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(xattrs_config.source_dir, path); + char *_path = prepend_source_directory(path); res = access(_path, mask); free(_path); @@ -53,8 +65,11 @@ 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(xattrs_config.source_dir, path); + char *_path = prepend_source_directory(path); res = readlink(_path, buf, size - 1); free(_path); @@ -72,16 +87,23 @@ 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); + 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; @@ -96,7 +118,11 @@ 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; - char *_path = prepend_source_directory(xattrs_config.source_dir, path); + 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 */ @@ -118,8 +144,11 @@ 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(xattrs_config.source_dir, path); + char *_path = prepend_source_directory(path); res = mkdir(_path, mode); free(_path); @@ -131,21 +160,38 @@ 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(xattrs_config.source_dir, 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) { + return -ENOENT; + } - char *_path = prepend_source_directory(xattrs_config.source_dir, path); + char *_path = prepend_source_directory(path); res = rmdir(_path); free(_path); @@ -157,8 +203,13 @@ 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(xattrs_config.source_dir, to); + char *_to = prepend_source_directory(to); res = symlink(from, _to); free(_to); @@ -170,24 +221,51 @@ 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(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) { + 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) { + if (filename_is_sidecar(from) == 1 || filename_is_sidecar(to)) { + return -ENOENT; + } + } - 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); @@ -200,8 +278,11 @@ 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(xattrs_config.source_dir, path); + char *_path = prepend_source_directory(path); res = chmod(_path, mode); free(_path); @@ -213,8 +294,11 @@ 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(xattrs_config.source_dir, path); + char *_path = prepend_source_directory(path); res = lchown(_path, uid, gid); free(_path); @@ -226,8 +310,11 @@ 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(xattrs_config.source_dir, path); + char *_path = prepend_source_directory(path); res = truncate(_path, size); free(_path); @@ -241,10 +328,14 @@ 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(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); @@ -256,65 +347,59 @@ 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); + char *_path = prepend_source_directory(path); + 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) { - 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; + struct fuse_file_info *fi) +{ + (void) path; + if (fi == NULL || fi->fh == 0) { + return -1; + } - 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) { - 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; + off_t offset, struct fuse_file_info *fi) +{ + (void) path; + if (fi == NULL || fi->fh == 0) { + return -1; + } - res = pwrite(fd, buf, size, offset); + int res = pwrite(fi->fh, buf, size, offset); if (res == -1) res = -errno; - close(fd); return res; } 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(xattrs_config.source_dir, path); + char *_path = prepend_source_directory(path); res = statvfs(_path, stbuf); free(_path); @@ -325,12 +410,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, @@ -348,24 +429,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) { - int fd; - int res; - - (void) fi; + (void) path; + if (fi == NULL || fi->fh == 0) { + return -1; + } + int res; 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