summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorOssama Othman <ossama.othman@intel.com>2013-05-14 09:48:26 -0700
committerKristian Høgsberg <krh@bitplanet.net>2013-05-14 14:36:37 -0400
commita50e6e4c500e3080b8df7ec14c7e42741477a423 (patch)
tree0cae5b3f325814e7f2d859eaa3f2c2415c69eb33 /tests
parent95eb3a2eb470bd341ab078c7e48a28ffebc6dde1 (diff)
downloadweston-a50e6e4c500e3080b8df7ec14c7e42741477a423.tar.gz
weston-a50e6e4c500e3080b8df7ec14c7e42741477a423.tar.bz2
weston-a50e6e4c500e3080b8df7ec14c7e42741477a423.zip
config-parser: Honor XDG_CONFIG_DIRS
This set of changes adds support for searching for a given config file in the directories listed in $XDG_CONFIG_DIRS if it wasn't found in $XDG_CONFIG_HOME or ~/.config. This allows packages to install custom config files in /etc/xdg/weston, for example, thus allowing them to avoid dealing with home directories. To avoid a TOCTOU race the config file is actually open()ed during the search. Its file descriptor is returned and stored in the compositor for later use when performing subsequent config file parses. Signed-off-by: Ossama Othman <ossama.othman@intel.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/weston-test.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/weston-test.c b/tests/weston-test.c
index 612841b5..b629c86c 100644
--- a/tests/weston-test.c
+++ b/tests/weston-test.c
@@ -225,7 +225,7 @@ idle_launch_client(void *data)
WL_EXPORT int
module_init(struct weston_compositor *ec,
- int *argc, char *argv[], const char *config_file)
+ int *argc, char *argv[])
{
struct weston_test *test;
struct wl_event_loop *loop;