ariadne
/
pkgconf
3
6
Fork 4
Code Issues 6 Pull Requests 2 Projects Releases 2 Wiki Activity

cli: allow --env to work with --variable

master
Ariadne Conill 2024-08-06 10:42:18 -07:00
parent 2070c00d63
commit 0ca4e5d00c
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cli/main.c
View File

@ -549,6 +549,9 @@ apply_env_variables(pkgconf_client_t *client, pkgconf_pkg_t *world, const char *
char havebuf[PKGCONF_ITEM_SIZE]; char havebuf[PKGCONF_ITEM_SIZE];
char *p; char *p;
if (want_variable != NULL && strcmp(want_variable, tuple->key))
continue;
snprintf(havebuf, sizeof havebuf, "%s_%s", env_prefix, tuple->key); snprintf(havebuf, sizeof havebuf, "%s_%s", env_prefix, tuple->key);
for (p = havebuf; *p; p++) for (p = havebuf; *p; p++)
@ -589,7 +592,7 @@ apply_env(pkgconf_client_t *client, pkgconf_pkg_t *world, void *env_prefix_p, in
if (!apply_env_var(workbuf, client, world, maxdepth, pkgconf_pkg_libs, filter_libs, NULL)) if (!apply_env_var(workbuf, client, world, maxdepth, pkgconf_pkg_libs, filter_libs, NULL))
return false; return false;
if ((want_flags & PKG_VARIABLES) == PKG_VARIABLES) if ((want_flags & PKG_VARIABLES) == PKG_VARIABLES || want_variable != NULL)
apply_env_variables(client, world, want_env_prefix); apply_env_variables(client, world, want_env_prefix);
return true; return true;