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

Change %undefine macro to "func" style now that we can 

%undefine parsing its own argument makes no sense whatsoever,
it's just a name and nothing special. Now that the calling syntax
is no longer an issue, make it sane. No functional changes.
This commit is contained in:
Panu Matilainen 2020-11-26 10:23:06 +02:00
parent 78bb7369a3
commit aec8bdb53a
1 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
rpmio/macro.c
View File

@ -752,30 +752,14 @@ exit:
static size_t static size_t
doUndefine(MacroBuf mb, rpmMacroEntry me, ARGV_t argv) doUndefine(MacroBuf mb, rpmMacroEntry me, ARGV_t argv)
{ {
const char *se = argv[1]; const char *n = argv[1];
const char *start = se; if (!validName(mb, n, strlen(n), "%undefine")) {
const char *s = se;
char *buf = xmalloc(strlen(s) + 1);
char *n = buf, *ne = n;
int c;
COPYNAME(ne, s, c);
/* Move scan over body */
while (iseol(*s))
s++;
se = s;
if (!validName(mb, n, ne - n, "%undefine")) {
mb->error = 1; mb->error = 1;
goto exit; } else {
popMacro(mb->mc, n);
} }
popMacro(mb->mc, n); return 0;
exit:
_free(buf);
return se - start;
} }
static size_t doDef(MacroBuf mb, rpmMacroEntry me, ARGV_t argv) static size_t doDef(MacroBuf mb, rpmMacroEntry me, ARGV_t argv)
@ -1284,7 +1268,7 @@ static struct builtins_s {
{ "trace", doTrace, 0, ME_FUNC }, { "trace", doTrace, 0, ME_FUNC },
{ "u2p", doFoo, 1, ME_FUNC }, { "u2p", doFoo, 1, ME_FUNC },
{ "uncompress", doUncompress, 1, ME_FUNC }, { "uncompress", doUncompress, 1, ME_FUNC },
{ "undefine", doUndefine, 1, ME_PARSE }, { "undefine", doUndefine, 1, ME_FUNC },
{ "url2path", doFoo, 1, ME_FUNC }, { "url2path", doFoo, 1, ME_FUNC },
{ "verbose", doVerbose, 0, ME_FUNC }, { "verbose", doVerbose, 0, ME_FUNC },
{ "warn", doOutput, 1, ME_FUNC }, { "warn", doOutput, 1, ME_FUNC },