Attachment 83837 Details for Bug 67904 – Unquote values of requested variables

Unquote values of requested variables

0001-Unquote-values-of-requested-variables.patch (text/plain), 1.40 KB, created by Marek Kasik on 2013-08-08 14:21:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marek Kasik

Created: 2013-08-08 14:21:54 UTC

Size: 1.40 KB

patch

obsolete

>From 2b88931e03742318246b1275df9570853bcbfb89 Mon Sep 17 00:00:00 2001
>From: Marek Kasik <mkasik@redhat.com>
>Date: Thu, 8 Aug 2013 16:20:20 +0200
>Subject: [PATCH] Unquote values of requested variables
>
>---
> pkg.c | 20 ++++++++++++++++----
> 1 file changed, 16 insertions(+), 4 deletions(-)
>
>diff --git a/pkg.c b/pkg.c
>index 66cd515..3697fec 100644
>--- a/pkg.c
>+++ b/pkg.c
>@@ -1042,6 +1042,7 @@ packages_get_var (GList     *pkgs,
>   GList *tmp;
>   GString *str;
>   char *retval;
>+  GError *error = NULL;
>   
>   str = g_string_new ("");
>   
>@@ -1049,14 +1050,25 @@ packages_get_var (GList     *pkgs,
>   while (tmp != NULL)
>     {
>       Package *pkg = tmp->data;
>-      char *var;
>+      char *var, *unquoted_var;
> 
>       var = package_get_var (pkg, varname);
>-      
>       if (var)
>         {
>-          g_string_append (str, var);
>-          g_string_append_c (str, ' ');                
>+          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_free (var);
>         }
> 
>-- 
>1.8.3.1
>

Actions: View

Attachments on bug 67904: 83837

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.