diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2020-04-03 14:38:31 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2020-04-03 15:44:22 +0100 |
| commit | 4aaeaddeaa130a227a694d32b7214689e982a39e (patch) | |
| tree | eb8b03f87ff944de0521a9df598611c075c7a163 /src | |
| parent | a5dc727afcc92deab722a84ae5cf3d00ae74c5f6 (diff) | |
dsearch: filter-matches option
Diffstat (limited to 'src')
| -rw-r--r-- | src/src/lookups/dsearch.c | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/src/src/lookups/dsearch.c b/src/src/lookups/dsearch.c index 0509a761b..9bb76cc25 100644 --- a/src/src/lookups/dsearch.c +++ b/src/src/lookups/dsearch.c @@ -65,6 +65,11 @@ return FALSE; *************************************************/ #define RET_FULL BIT(0) +#define FILTER_TYPE BIT(1) +#define FILTER_ALL BIT(1) +#define FILTER_FILE BIT(2) +#define FILTER_DIR BIT(3) +#define FILTER_SUBDIR BIT(4) /* See local README for interface description. We use lstat() instead of scanning the directory, as it is hopefully faster to let the OS do the scanning @@ -99,10 +104,29 @@ if (opts) while ((ele = string_nextinlist(&opts, &sep, NULL, 0))) if (Ustrcmp(ele, "ret=full") == 0) flags |= RET_FULL; + else if (Ustrncmp(ele, "filter=", 7) == 0) + { + ele += 7; + if (Ustrcmp(ele, "file") == 0) + flags |= FILTER_TYPE | FILTER_FILE; + else if (Ustrcmp(ele, "dir") == 0) + flags |= FILTER_TYPE | FILTER_DIR; + else if (Ustrcmp(ele, "subdir") == 0) + flags |= FILTER_TYPE | FILTER_SUBDIR; /* like dir but not "." or ".." */ + } } filename = string_sprintf("%s/%s", dirname, keystring); -if (Ulstat(filename, &statbuf) >= 0) +if ( Ulstat(filename, &statbuf) >= 0 + && ( !(flags & FILTER_TYPE) + || (flags & FILTER_FILE && S_ISREG(statbuf.st_mode)) + || ( flags & (FILTER_DIR | FILTER_SUBDIR) + && S_ISDIR(statbuf.st_mode) + && ( flags & FILTER_DIR + || keystring[0] != '.' + || keystring[1] != '.' + || keystring[1] && keystring[2] + ) ) ) ) { /* Since the filename exists in the filesystem, we can return a non-tainted result. */ |