Allow $() through unescaped.

$(foo) is used for make escapes, so allow them through.

Freedesktop #33920
This commit is contained in:
Tollef Fog Heen 2011-04-13 22:02:51 +02:00
parent 4366f5842f
commit 1b1bd80f5f
3 changed files with 5 additions and 3 deletions

View file

@ -11,7 +11,7 @@ set -e
# expect cflags from whitespace
ARGS="--cflags whitespace"
RESULT="-Dlala=misc -I/usr/white\\ space/include -Iinclude\\ dir -Iother\\ include\\ dir"
RESULT='-Dlala=misc -I/usr/white\ space/include -I$(top_builddir) -Iinclude\ dir -Iother\ include\ dir'
run_test
# expect libs from whitespace

View file

@ -8,4 +8,4 @@ Description: Dummy pkgconfig test package for testing pkgconfig
Version: 1.0.0
Requires:
Libs: -L${libdir} -lfoo\ bar "-lbar baz" -r:foo
Cflags: -I${includedir} -Iinclude\ dir "-Iother include dir" -Dlala=misc
Cflags: -I${includedir} -I$(top_builddir) -Iinclude\ dir "-Iother include dir" -Dlala=misc

View file

@ -638,7 +638,9 @@ static char *strdup_escape_shell(const char *s)
size_t r_s = strlen(s)+10, c = 0;
char *r = g_malloc(r_s);
while (s[0]) {
if ((s[0] < '+') ||
if ((s[0] < '$') ||
(s[0] > '$' && s[0] < '(') ||
(s[0] > ')' && s[0] < '+') ||
(s[0] > ':' && s[0] < '=') ||
(s[0] > '=' && s[0] < '@') ||
(s[0] > 'Z' && s[0] < '^') ||