summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Nicholson <nicholson@endlessm.com>2014-03-09 15:00:33 -0700
committerDan Nicholson <nicholson@endlessm.com>2014-12-09 06:29:26 -0800
commita6e8749ada5af1737b27f1eca1babe83e82af38c (patch)
treeece8af70a958a1c406ee452fcc8c387f4eb95c65
parent2808a5497c0dbcc7b6dbc81652718192ba7b7552 (diff)
Quote pc_path virtual variable
Since we unquote variables on printing, we want to quote in before adding to the database. For all other variables defined in .pc files, we assume that the user has quoted the variable correctly. This was broken with the fix for bug 67904, but seems to only affect Windows builds.
-rw-r--r--pkg.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkg.c b/pkg.c
index a4733d6..a8980f0 100644
--- a/pkg.c
+++ b/pkg.c
@@ -222,6 +222,7 @@ static Package *
add_virtual_pkgconfig_package (void)
{
Package *pkg = NULL;
+ gchar *path_quoted;
pkg = g_new0 (Package, 1);
@@ -234,7 +235,8 @@ add_virtual_pkgconfig_package (void)
if (pkg->vars == NULL)
pkg->vars = g_hash_table_new (g_str_hash, g_str_equal);
- g_hash_table_insert (pkg->vars, "pc_path", pkg_config_pc_path);
+ path_quoted = g_shell_quote (pkg_config_pc_path);
+ g_hash_table_insert (pkg->vars, "pc_path", path_quoted);
debug_spew ("Adding virtual 'pkg-config' package to list of known packages\n");
g_hash_table_insert (packages, pkg->key, pkg);