Attachment 121398 Details for Bug 93284 – Revert "Unquote values of requested variables"

[patch] Revert "Unquote values of requested variables"

Revert-Unquote-values-of-requested-variables.patch (text/plain), 2.16 KB, created by Dan Nicholson on 2016-01-29 22:12:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dan Nicholson

Created: 2016-01-29 22:12:06 UTC

Size: 2.16 KB

patch

obsolete

>From 35e269384a6a15d74b953d563672a6b4e346529f Mon Sep 17 00:00:00 2001
>From: Dan Nicholson <dbn.lists@gmail.com>
>Date: Sat, 23 Jan 2016 08:47:22 -0800
>Subject: [PATCH] Revert "Unquote values of requested variables"
>
>This reverts commit 50c2867f4a6981e085c721d936c96f174f11f415.
>g_shell_quote doesn't match the quoting behavior of pkg-config when the
>same variables are output via --cflags and similar.
>
>https://bugs.freedesktop.org/show_bug.cgi?id=93284
>---
> check/check-whitespace |  4 ----
> pkg.c                  | 20 ++++----------------
> 2 files changed, 4 insertions(+), 20 deletions(-)
>
>diff --git a/check/check-whitespace b/check/check-whitespace
>index b062bc0..e4388ba 100755
>--- a/check/check-whitespace
>+++ b/check/check-whitespace
>@@ -4,10 +4,6 @@ set -e
> 
> . ${srcdir}/common
> 
>-# variables come out unquoted
>-RESULT='/usr/white space/include'
>-run_test --variable=includedir whitespace
>-
> # expect cflags from whitespace
> RESULT='-Dlala=misc -I/usr/white\ space/include -I$(top_builddir) -Iinclude\ dir -Iother\ include\ dir'
> run_test --cflags whitespace
>diff --git a/pkg.c b/pkg.c
>index 7f583e7..d0d3edf 100644
>--- a/pkg.c
>+++ b/pkg.c
>@@ -1040,7 +1040,6 @@ packages_get_var (GList     *pkgs,
>   GList *tmp;
>   GString *str;
>   char *retval;
>-  GError *error = NULL;
>   
>   str = g_string_new ("");
>   
>@@ -1048,25 +1047,14 @@ packages_get_var (GList     *pkgs,
>   while (tmp != NULL)
>     {
>       Package *pkg = tmp->data;
>-      char *var, *unquoted_var;
>+      char *var;
> 
>       var = package_get_var (pkg, varname);
>+      
>       if (var)
>         {
>-          unquoted_var = g_shell_unquote (var, &error);
>-          if (unquoted_var != NULL)
>-            {
>-              g_string_append (str, unquoted_var);
>-              g_string_append_c (str, ' ');
>-              g_free (unquoted_var);
>-            }
>-          else
>-            {
>-              verbose_error ("Couldn't unquote value of \"%s\": %s\n",
>-                             varname, error ? error->message : "unknown");
>-              g_clear_error (&error);
>-            }
>-
>+          g_string_append (str, var);
>+          g_string_append_c (str, ' ');                
>           g_free (var);
>         }
> 
>-- 
>2.5.0

Actions: View | Splinter Review

Attachments on bug 93284: 121398 | 121399 | 121400 | 121401

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.