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

Add %{shescape:...} macro for single quoting with escapes for the shell 

This is exactly the same as :shescape query format, hence the name.
This commit is contained in:
Panu Matilainen 2021-09-22 13:56:08 +03:00 committed by Florian Festi
parent c495d73449
commit f64ad44ccd
3 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/manual/macros.md
View File

@ -98,6 +98,7 @@ to perform useful operations. The current list is
%{lua:...} expand using the [embedded Lua interpreter](lua.md)
%{expand:...} like eval, expand ... to <body> and (re-)expand <body>
%{expr:...} evaluate an expression
%{shescape:...} single quote with escapes for use in shell
%{shrink:...} trim leading and trailing whitespace, reduce
intermediate whitespace to a single space
%{quote:...} quote a parametric macro argument, needed to pass

24
rpmio/macro.c
View File

@ -1145,6 +1145,29 @@ static size_t doVerbose(MacroBuf mb, rpmMacroEntry me, ARGV_t argv)
return 0;
}
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++ = '\'';
} else {
*dst++ = *src;
}
}
*dst++ = '\'';
*dst = '\0';
mbAppendStr(mb, result);
return 0;
}
static size_t
doFoo(MacroBuf mb, rpmMacroEntry me, ARGV_t argv)
{
@ -1279,6 +1302,7 @@ static struct builtins_s {
{ "suffix", doFoo, 1, ME_FUNC },
{ "trace", doTrace, 0, ME_FUNC },
{ "u2p", doFoo, 1, ME_FUNC },
{ "shescape", doShescape, 1, ME_FUNC },
{ "uncompress", doUncompress, 1, ME_FUNC },
{ "undefine", doUndefine, 1, ME_FUNC },
{ "url2path", doFoo, 1, ME_FUNC },

12
tests/rpmmacro.at
View File

@ -863,6 +863,18 @@ runroot rpm \
])
AT_CLEANUP
AT_SETUP([%shescape macro])
AT_KEYWORDS([macros])
AT_CHECK([
runroot rpm \
--eval "%{shescape:foo's}"
],
[0],
['foo'\''s'
],
[])
AT_CLEANUP
AT_SETUP([macro with a line starting by "{"])
AT_KEYWORDS([macros])
AT_CHECK([