path: root/src/basic/exec-util.c
diff options
authorLennart Poettering <>2018-04-16 21:24:13 +0200
committerSven Eden <>2018-08-24 16:47:08 +0200
commitb395aac97d4b8be2f3e6232ba0412ff8203b47bb (patch)
treee708ef0492069e0594d4209bdab53c8945e09b3d /src/basic/exec-util.c
parentc3b609e3c6df2b203a980f515017d749eb665124 (diff)
conf-files: beef up conf-files.[ch] a bit
This adds fozr new flags: - If CONF_FILES_DIRECTORY is specified conf_file_list() and friends will look for directories only. - Similar CONF_FILES_REGULAR means we'll look only for regular files. - If CONF_FILES_BASENAME is specified the resulting list will contain only the basenames of all discovered files or directories, not the full paths. - If CONF_FILES_FILTER_MASKED is specified the resulting list will have masked entries removed (i.e. those symlinked to /dev/null and suchlike) These four flags are useful for discovering portable service profile information. While we are at it, also improve a couple of other things: - More debug logging - use path_hash_ops instead of string_hash_ops when putting together the path lists
Diffstat (limited to 'src/basic/exec-util.c')
1 files changed, 1 insertions, 1 deletions
diff --git a/src/basic/exec-util.c b/src/basic/exec-util.c
index e7b0e0fc0..ad486db1a 100644
--- a/src/basic/exec-util.c
+++ b/src/basic/exec-util.c
@@ -89,7 +89,7 @@ static int do_execute(
* If callbacks is nonnull, execution is serial. Otherwise, we default to parallel.
- r = conf_files_list_strv(&paths, NULL, NULL, CONF_FILES_EXECUTABLE, (const char* const*) directories);
+ r = conf_files_list_strv(&paths, NULL, NULL, CONF_FILES_EXECUTABLE|CONF_FILES_REGULAR|CONF_FILES_FILTER_MASKED, (const char* const*) directories);
if (r < 0)
return r;