From 66d49f1375fec838bcd301bb4ca2ef76cee0e47c Mon Sep 17 00:00:00 2001 From: Tollef Fog Heen Date: Sun, 6 Dec 2009 22:40:13 +0100 Subject: [PATCH] Clean up sysroot support a little bit This should fix bug #16905 properly. --- pkg.c | 41 +++++++++++++++-------------------------- 1 file changed, 15 insertions(+), 26 deletions(-) diff --git a/pkg.c b/pkg.c index 48c96fd..0409531 100644 --- a/pkg.c +++ b/pkg.c @@ -479,33 +479,22 @@ string_list_to_string (GSList *list) char *retval; tmp = list; - while (tmp != NULL) - { - char *tmpstr = (char*) tmp->data; - if (pcsysrootdir != NULL) - { - if (tmpstr[0] == '-' && - (tmpstr[1] == 'I' || - tmpstr[1] == 'L')) - { - g_string_append_c (str, '-'); - g_string_append_c (str, tmpstr[1]); - g_string_append (str, pcsysrootdir); - g_string_append (str, tmpstr+2); - } - else - { - g_string_append (str, tmpstr); - } - } - else - { - g_string_append (str, tmpstr); - } - g_string_append_c (str, ' '); - - tmp = g_slist_next (tmp); + while (tmp != NULL) { + char *tmpstr = (char*) tmp->data; + if (pcsysrootdir != NULL && + tmpstr[0] == '-' && + (tmpstr[1] == 'I' || + tmpstr[1] == 'L')) { + g_string_append_c (str, '-'); + g_string_append_c (str, tmpstr[1]); + g_string_append (str, pcsysrootdir); + g_string_append (str, tmpstr+2); + } else { + g_string_append (str, tmpstr); } + g_string_append_c (str, ' '); + tmp = g_slist_next (tmp); + } retval = str->str; g_string_free (str, FALSE);