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

Clean up shescape macro implementation 

Realizing that we have dynamic string buffer available in the macro
engine... so we don't need a dumb worst case malloc and all the other
crap in the old tag format era implementation.
This commit is contained in:
Panu Matilainen 2021-10-08 15:20:17 +03:00 committed by Florian Festi
parent 470498bd5a
commit 5e97c0a3ac
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
rpmio/macro.c
View File

@ -1147,24 +1147,15 @@ static size_t doVerbose(MacroBuf mb, rpmMacroEntry me, ARGV_t argv)
static size_t doShescape(MacroBuf mb, rpmMacroEntry me, ARGV_t argv)
{
char *result, *dst;
const char *src = argv[1];
result = dst = xmalloc(strlen(src) * 4 + 3);
*dst++ = '\'';
for (; *src != '\0'; src++) {
if (*src == '\'') {
*dst++ = '\'';
*dst++ = '\\';
*dst++ = '\'';
*dst++ = '\'';
mbAppend(mb, '\'');
for (const char *s = argv[1]; *s != '\0'; s++) {
if (*s == '\'') {
mbAppendStr(mb, "'\\''");
} else {
*dst++ = *src;
mbAppend(mb, *s);
}
}
*dst++ = '\'';
*dst = '\0';
mbAppendStr(mb, result);
mbAppend(mb, '\'');
return 0;
}