dcbaker
/
pkgconf
forked from ariadne/pkgconf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pkgconf: Handle spaces correctly when expanding variables 

Given the following .pc fragment:

includedir=/mingw64/include
Cflags: -I${includedir} -I${includedir}/taglib

Should includedir be assigned the value 'C:/Program\ Files/Git/mingw64/include', the expansion of ${includedir} will be chopped off after the first space:

Cflags: -IC:/Program\

With this patch, the expansion is corrected:

Cflags: -IC:/Program\ Files/Git/mingw64/include -IC:/Program\ Files/Git/mingw64/include/taglib

Create spaces-in-paths.pc
master
Ziemowit Łąski 2022-11-22 12:29:09 -08:00 committed by Ariadne Conill
parent 27287f323d
commit 1c3f246198
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libpkgconf/argvsplit.c
View File

@ -80,7 +80,7 @@ pkgconf_argv_split(const char *src, int *argc, char ***argv)
if (escaped)
{
/* POSIX: only \CHAR is special inside a double quote if CHAR is {$, `, ", \, newline}. */
if (quote == '\"')
if (quote)
{
if (!(*src_iter == '$' || *src_iter == '`' || *src_iter == '"' || *src_iter == '\\'))
*dst_iter++ = '\\';
@ -88,7 +88,14 @@ pkgconf_argv_split(const char *src, int *argc, char ***argv)
*dst_iter++ = *src_iter;
}
else
{
/* If we are outside a quoted string/char, an escaped space is usually used to
preserve spaces in file names. */
if (*src_iter != ' ')
*dst_iter++ = '\\';
*dst_iter++ = *src_iter;
}
escaped = false;
}
@ -118,11 +125,9 @@ pkgconf_argv_split(const char *src, int *argc, char ***argv)
}
else switch(*src_iter)
{
#ifndef _WIN32
case '\\':
escaped = true;
break;
#endif
case '\"':
case '\'':

7
tests/lib1/spaces-in-paths.pc Normal file
View File

@ -0,0 +1,7 @@
prefix=/test\ with\ spaces
includedir=${prefix}/include
Name: spaces-in-paths
Version: 1
Description: test package for properly expanding spaces in variables
Cflags: -I${includedir} -I${includedir}/subdir