ariadne
/
pkgconf
3
6
Fork 4
Code Issues 6 Pull Requests 2 Projects Releases 2 Wiki Activity

argvsplit: fix some quoting rules

pull/249/head
huyubiao 2023-03-06 20:05:22 +08:00 committed by Ariadne Conill
parent 212c85863a
commit 6d1f160e89
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libpkgconf/argvsplit.c
View File

@ -89,11 +89,6 @@ pkgconf_argv_split(const char *src, int *argc, char ***argv)
} }
else else
{ {
/* If we are outside a quoted string/char, an escaped space is usually used to
preserve spaces in file names. */
if (!(*src_iter == '$' || *src_iter == '`' || *src_iter == '"' || *src_iter == '\\' || *src_iter == ' '))
*dst_iter++ = '\\';
*dst_iter++ = *src_iter; *dst_iter++ = *src_iter;
} }

2
tests/lib1/quotes.pc
View File

@ -7,4 +7,4 @@ Name: quotes
Description: A testing pkg-config file Description: A testing pkg-config file
Version: 1.2.3 Version: 1.2.3
Libs: -L${libdir} -lfoo Libs: -L${libdir} -lfoo
Cflags: -DQUOTED=\"bla\" Cflags: -DQUOTED=\"bla\" -DA=\"escaped\ string\'\ \literal\" -DB="\1\$" -DC='bla'

2
tests/parser.sh
View File

@ -142,7 +142,7 @@ quoted_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib1" export PKG_CONFIG_PATH="${selfdir}/lib1"
atf_check \ atf_check \
-o inline:"-DQUOTED=\\\"bla\\\"\n" \ -o inline:"-DQUOTED=\\\"bla\\\" -DA=\\\"escaped\\ string\\\'\\ literal\\\" -DB=\\\\\\1\$ -DC=bla\n" \
pkgconf --cflags quotes pkgconf --cflags quotes
} }