folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Double the '%' chars when splitting macro args 

Before this commit, there was an "escape" flag that made the macro
expansion keep '%%' escapes. But this did not work for macros
that returned an '%' character by other means.

Remove the old escape mechanism and instead double the '%' characters
when the body is split into argument.

Fixes: #1055
This commit is contained in:
Michael Schroeder 2020-02-06 14:37:34 +01:00 committed by Panu Matilainen
parent dcf84ab8e9
commit 8b1ea52de3
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
rpmio/macro.c
View File

@ -109,7 +109,6 @@ typedef struct MacroBuf_s {
int error; /*!< Errors encountered during expansion? */
int macro_trace; /*!< Pre-print macro to expand? */
int expand_trace; /*!< Post-print macro expansion? */
int escape; /*!< Preserve '%%' during expansion? */
int flags; /*!< Flags to control behavior */
rpmMacroContext mc;
} * MacroBuf;
@ -860,11 +859,13 @@ static void splitQuoted(ARGV_t *av, const char * str, const char * seps)
size_t slen = s - start;
/* quoted arguments are always kept, otherwise skip empty args */
if (slen > 0) {
char *d, arg[slen + 1];
char *d, arg[2 * slen + 1];
const char *t;
for (d = arg, t = start; t - start < slen; t++) {
if (*t == qchar)
continue;
if (*t == '%') /* preserve '%' characters by doubling */
*d++ = '%';
*d++ = *t;
}
arg[d - arg] = '\0';
@ -907,14 +908,10 @@ grabArgs(MacroBuf mb, const rpmMacroEntry me, const char * se,
*/
argvAdd(&argv, me->name);
if (lastc) {
int oescape = mb->escape;
char *s = NULL;
/* Expand possible macros in arguments */
mb->escape = 1;
expandThis(mb, se, lastc-se, &s);
mb->escape = oescape;
splitQuoted(&argv, s, " \t");
free(s);
@ -1348,8 +1345,6 @@ expandMacro(MacroBuf mb, const char *src, size_t slen)
if (*s != '%')
break;
s++; /* skip first % in %% */
if (mb->escape)
mbAppend(mb, c);
}
default:
mbAppend(mb, c);