Allow : and = unescaped in output too

This commit is contained in:
Tollef Fog Heen 2010-05-27 21:48:52 +02:00
parent 376d42b004
commit 2ce485c65d
3 changed files with 6 additions and 5 deletions

View file

@ -11,10 +11,10 @@ set -e
# expect cflags from whitespace
ARGS="--cflags whitespace"
RESULT="-I/usr/white\\ space/include -Iinclude\\ dir -Iother\\ include\\ dir"
RESULT="-Dlala=misc -I/usr/white\\ space/include -Iinclude\\ dir -Iother\\ include\\ dir"
run_test
# expect libs from whitespace
ARGS="--libs whitespace"
RESULT="-L/usr/white\\ space/lib -lfoo\\ bar -lbar\\ baz"
RESULT="-r:foo -L/usr/white\\ space/lib -lfoo\\ bar -lbar\\ baz"
run_test

View file

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

View file

@ -639,7 +639,8 @@ static char *strdup_escape_shell(const char *s)
char *r = g_malloc(r_s);
while (s[0]) {
if ((s[0] < '+') ||
(s[0] > '9' && s[0] < '@') ||
(s[0] > ':' && s[0] < '=') ||
(s[0] > '=' && s[0] < '@') ||
(s[0] > 'Z' && s[0] < '^') ||
(s[0] == '`') ||
(s[0] > 'z')) {