Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add "readable" option to hide unreadable files #35

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add "readable" option to hide unreadable files #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
be49f79
Add "readable" option to hide unreadable files
Jun 7, 2020
2932096
Match directories with a trailing slash.
Nov 20, 2018
d509399
build fix after merge from kalvdans
Jun 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 46 additions & 10 deletions rofs-filtered.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ struct rofs_config {
char *rw_path;
char *config;
int invert;
int readable;
int debug;
int preserve_perms;
};
Expand Down Expand Up @@ -397,20 +398,53 @@ static int read_config(const char *conf_file) {
}

/** If the file name matches one of the RegEx patterns, hide it. */
static int should_hide(const char *name, mode_t mode) {
static int should_hide(const char *path, mode_t mode) {
mode &= S_IFMT;
log_msg(LOG_DEBUG, "should_hide: %s %07o", name, mode);
log_msg(LOG_DEBUG, "should_hide: %s %07o", path, mode);
if (conf.readable) {
char *trpath=translate_path(path);
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

spaces missing around assignment operator

if (!trpath) {
log_msg(LOG_DEBUG, "untranslatable path: %s", path);
return 1;
}
struct stat st;
if (stat(trpath, &st)) {
log_msg(LOG_DEBUG, "unreadable: %s", path);
free(trpath);
return 1;
}
free(trpath);
}
for (int i = 0; i < modes_count; ++i)
if (mode == modes[i]) {
log_msg(LOG_DEBUG, "type: %07o %s", mode, name);
log_msg(LOG_DEBUG, "type: %07o %s", mode, path);
return !conf.invert;
}
if (conf.invert && mode != S_IFREG && mode != S_IFDIR)
return conf.invert;
if (!regexec(&pattern, name, 0, NULL, 0)) {
// We have a match.
log_msg(LOG_DEBUG, "match: %s", name);
return !conf.invert;

/* Append slash if directory */
if (mode == S_IFDIR) {
char *path_slash = malloc(strlen(path) + 2);
if (!path_slash) {
log_msg(LOG_DEBUG, "out of memory while handling %s", path);
return 0;
}
strcpy(path_slash, path);
strcat(path_slash, "/");
if (!regexec(&pattern, path_slash, 0, NULL, 0)) {
// We have a match.
log_msg(LOG_DEBUG, "match: %s", path_slash);
free(path_slash);
return !conf.invert;
}
free(path_slash);
} else {
if (!regexec(&pattern, path, 0, NULL, 0)) {
// We have a match.
log_msg(LOG_DEBUG, "match: %s", path);
return !conf.invert;
}
}
return conf.invert;
}
Expand Down Expand Up @@ -464,7 +498,7 @@ static int callback_readlink(const char *path, char *buf, size_t size) {
static int callback_readdir(const char *path, void *buf, fuse_fill_dir_t filler,
off_t offset, struct fuse_file_info *fi)
{
if (should_hide(path, S_IFREG)) return -ENOENT;
if (should_hide(path, S_IFDIR)) return -ENOENT;

DIR *dp;
struct dirent *de;
Expand Down Expand Up @@ -918,7 +952,8 @@ static struct fuse_opt rofs_opts[] = {
ROFS_OPT("config=%s", config, 0),
ROFS_OPT("-c %s", config, 0),
ROFS_OPT("invert", invert, 1),
ROFS_OPT("preserve-perms", preserve_perms, 1),
ROFS_OPT("readable", readable, 1),
ROFS_OPT("preserve-perms", preserve_perms, 1),

FUSE_OPT_KEY("-V", KEY_VERSION),
FUSE_OPT_KEY("--version", KEY_VERSION),
Expand All @@ -943,7 +978,8 @@ static int rofs_opt_proc(void *data, const char *arg, int key, struct fuse_args
" -o source=DIR directory to mount as read-only and filter\n"
" -o config=CONFIG_FILE config file path (default: %s)\n"
" -o invert the config file specifies files to allow\n"
" -o preserve-perms do not clear write permission\n"
" -o readable hide unreadable files\n"
" -o preserve-perms do not clear write permission\n"
"\n"
, outargs->argv[0], default_config_file);
// Let fuse print out its help text as well...
Expand Down
6 changes: 3 additions & 3 deletions rofs-filtered.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
# /file1.flac
# /file1.mp3
# /file2.mp3
# /subDir1
# /subDir1/
# /subDir1/file3.flac
# etc...
#
Expand All @@ -52,10 +52,10 @@
.*\.flac$

# Hide subDir2 (and all its contents), no matter where it appears in the tree:
/subDir2$
/subDir2/$

# Hide the subDir2 but only if it occurs at the root of the tree:
^/subDir2$
^/subDir2/$

# Since a RegEx can not start with '|' (vertical bar), this symbol is used to
# escape out of RegEx mode and introduce special configuration flags.
Expand Down