projects
/
rrq
/
fuse_xattrs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
optimization: prepend_source_directory
[rrq/fuse_xattrs.git]
/
passthrough.c
diff --git
a/passthrough.c
b/passthrough.c
index 9ef527a3eaacb675cc8b62484cdc2c4e17be0b24..3f554905a67e721fa095a6333f8ca0ad01706692 100644
(file)
--- a/
passthrough.c
+++ b/
passthrough.c
@@
-22,15
+22,17
@@
#include <dirent.h>
#include <errno.h>
#include <dirent.h>
#include <errno.h>
-#include "fuse_xattrs_config.h"
-
#include "xattrs_config.h"
#include "utils.h"
int xmp_getattr(const char *path, struct stat *stbuf) {
int res;
#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);
res = lstat(_path, stbuf);
free(_path);
@@
-42,8
+44,11
@@
int xmp_getattr(const char *path, struct stat *stbuf) {
int xmp_access(const char *path, int mask) {
int res;
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);
res = access(_path, mask);
free(_path);
@@
-55,8
+60,11
@@
int xmp_access(const char *path, int mask) {
int xmp_readlink(const char *path, char *buf, size_t size) {
int res;
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);
res = readlink(_path, buf, size - 1);
free(_path);
@@
-76,7
+84,7
@@
int xmp_readdir(const char *path, void *buf, fuse_fill_dir_t filler,
(void) offset;
(void) fi;
(void) offset;
(void) fi;
- char *_path = prepend_source_directory(
xattrs_config.source_dir,
path);
+ char *_path = prepend_source_directory(path);
dp = opendir(_path);
free(_path);
dp = opendir(_path);
free(_path);
@@
-84,6
+92,10
@@
int xmp_readdir(const char *path, void *buf, fuse_fill_dir_t filler,
return -errno;
while ((de = readdir(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;
struct stat st;
memset(&st, 0, sizeof(st));
st.st_ino = de->d_ino;
@@
-98,7
+110,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;
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 */
/* On Linux this could just be 'mknod(path, mode, rdev)' but this
is more portable */
@@
-120,8
+136,11
@@
int xmp_mknod(const char *path, mode_t mode, dev_t rdev) {
int xmp_mkdir(const char *path, mode_t mode) {
int res;
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);
res = mkdir(_path, mode);
free(_path);
@@
-133,8
+152,11
@@
int xmp_mkdir(const char *path, mode_t mode) {
int xmp_unlink(const char *path) {
int res;
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);
res = unlink(_path);
free(_path);
@@
-146,8
+168,11
@@
int xmp_unlink(const char *path) {
int xmp_rmdir(const char *path) {
int res;
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);
res = rmdir(_path);
free(_path);
@@
-159,8
+184,13
@@
int xmp_rmdir(const char *path) {
int xmp_symlink(const char *from, const char *to) {
int res;
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);
res = symlink(from, _to);
free(_to);
@@
-172,9
+202,14
@@
int xmp_symlink(const char *from, const char *to) {
int xmp_rename(const char *from, const char *to) {
int res;
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);
res = rename(_from, _to);
free(_from);
free(_to);
@@
-187,9
+222,14
@@
int xmp_rename(const char *from, const char *to) {
int xmp_link(const char *from, const char *to) {
int res;
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);
res = link(_from, _to);
free(_from);
free(_to);
@@
-202,8
+242,11
@@
int xmp_link(const char *from, const char *to) {
int xmp_chmod(const char *path, mode_t mode) {
int res;
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);
res = chmod(_path, mode);
free(_path);
@@
-215,8
+258,11
@@
int xmp_chmod(const char *path, mode_t mode) {
int xmp_chown(const char *path, uid_t uid, gid_t gid) {
int res;
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);
res = lchown(_path, uid, gid);
free(_path);
@@
-228,8
+274,11
@@
int xmp_chown(const char *path, uid_t uid, gid_t gid) {
int xmp_truncate(const char *path, off_t size) {
int res;
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);
res = truncate(_path, size);
free(_path);
@@
-243,10
+292,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)
{
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;
(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);
/* don't use utime/utimes since they follow symlinks */
res = utimensat(0, _path, ts, AT_SYMLINK_NOFOLLOW);
free(_path);
@@
-259,8
+312,11
@@
struct fuse_file_info *fi)
int xmp_open(const char *path, struct fuse_file_info *fi) {
int res;
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(
xattrs_config.source_dir,
path);
+ char *_path = prepend_source_directory(path);
res = open(_path, fi->flags);
free(_path);
res = open(_path, fi->flags);
free(_path);
@@
-272,12
+328,17
@@
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,
}
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;
int fd;
int res;
(void) fi;
- char *_path = prepend_source_directory(
xattrs_config.source_dir,
path);
+ char *_path = prepend_source_directory(path);
fd = open(_path, O_RDONLY);
free(_path);
fd = open(_path, O_RDONLY);
free(_path);
@@
-293,12
+354,17
@@
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,
}
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;
int fd;
int res;
(void) fi;
- char *_path = prepend_source_directory(
xattrs_config.source_dir,
path);
+ char *_path = prepend_source_directory(path);
fd = open(_path, O_WRONLY);
free(_path);
fd = open(_path, O_WRONLY);
free(_path);
@@
-315,8
+381,11
@@
int xmp_write(const char *path, const char *buf, size_t size,
int xmp_statfs(const char *path, struct statvfs *stbuf) {
int 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);
res = statvfs(_path, stbuf);
free(_path);
@@
-350,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)
{
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;
int fd;
int res;
@@
-358,7
+431,7
@@
int xmp_fallocate(const char *path, int mode,
if (mode)
return -EOPNOTSUPP;
if (mode)
return -EOPNOTSUPP;
- char *_path =
concat(xattrs_config.source_dir,
path);
+ char *_path =
prepend_source_directory(
path);
fd = open(_path, O_WRONLY);
free(_path);
fd = open(_path, O_WRONLY);
free(_path);