Skip to content
Snippets Groups Projects
Commit d8b4a577 authored by Simon McVittie's avatar Simon McVittie
Browse files

pv_wrap_append_preload: Take environment as a parameter


This allows mock environment variables to be used during unit testing.

Signed-off-by: default avatarSimon McVittie <smcv@collabora.com>
parent d39dcb9c
No related branches found
No related tags found
1 merge request!337pressure-vessel: Remap preloadable modules better
......@@ -343,6 +343,8 @@ pv_wrap_move_into_scope (const char *steam_app_id)
* namespace, possibly including special ld.so tokens such as `$LIB`,
* or basename of a preloadable module to be found in the standard
* library search path
* @env: (array zero-terminated=1) (element-type filename): Environment
* variables to be used instead of `environ`
* @flags: Flags to adjust behaviour
* @runtime: (nullable): Runtime to be used in container
* @exports: (nullable): Used to configure extra paths that need to be
......@@ -356,6 +358,7 @@ pv_wrap_append_preload (GPtrArray *argv,
const char *variable,
const char *option,
const char *preload,
GStrv env,
PvAppendPreloadFlags flags,
PvRuntime *runtime,
FlatpakExports *exports)
......@@ -437,7 +440,7 @@ pv_wrap_append_preload (GPtrArray *argv,
else
{
const gchar *steam_path = NULL;
steam_path = g_getenv ("STEAM_COMPAT_CLIENT_INSTALL_PATH");
steam_path = g_environ_getenv (env, "STEAM_COMPAT_CLIENT_INSTALL_PATH");
if (steam_path != NULL && flatpak_has_path_prefix (preload, steam_path))
{
......
......@@ -62,6 +62,7 @@ void pv_wrap_append_preload (GPtrArray *argv,
const char *variable,
const char *option,
const char *preload,
GStrv env,
PvAppendPreloadFlags flags,
PvRuntime *runtime,
FlatpakExports *exports);
......@@ -2118,6 +2118,7 @@ main (int argc,
variable,
option,
g_ptr_array_index (values, j),
environ,
append_preload_flags,
runtime,
exports);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment