diff options
author | Tollef Fog Heen <tfheen@err.no> | 2010-05-27 21:48:52 +0200 |
---|---|---|
committer | Tollef Fog Heen <tfheen@err.no> | 2010-05-27 21:48:52 +0200 |
commit | 2ce485c65dd9d2bbd8e64dba275f449ff2303e72 (patch) | |
tree | 82b7ad71878612c73b40802402ed334f2038c9d5 | |
parent | 376d42b004bcbc60aa13a88d15925f244a1990db (diff) |
Allow : and = unescaped in output too
-rwxr-xr-x | check/check-whitespace | 4 | ||||
-rw-r--r-- | check/whitespace.pc | 4 | ||||
-rw-r--r-- | parse.c | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/check/check-whitespace b/check/check-whitespace index 38de0e8..31a413c 100755 --- a/check/check-whitespace +++ b/check/check-whitespace @@ -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 diff --git a/check/whitespace.pc b/check/whitespace.pc index e9d8488..50a8742 100644 --- a/check/whitespace.pc +++ b/check/whitespace.pc @@ -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 @@ -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')) { |