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

Change builtin "parse" type macros to take their arguments via an argv 

No functional changes here and not sure if/how these would ever take
multiple arguments, but there's another treasure at the end of
this particular rainbow...
This commit is contained in:
Panu Matilainen 2020-11-13 11:05:43 +02:00
parent 3d3f717d28
commit f5f9764e6d
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
rpmio/macro.c
View File

@ -135,7 +135,7 @@ static int print_macro_trace = _PRINT_MACRO_TRACE;
static int print_expand_trace = _PRINT_EXPAND_TRACE; static int print_expand_trace = _PRINT_EXPAND_TRACE;
typedef void (*macroFunc)(MacroBuf mb, rpmMacroEntry me, ARGV_t argv); typedef void (*macroFunc)(MacroBuf mb, rpmMacroEntry me, ARGV_t argv);
typedef size_t (*parseFunc)(MacroBuf mb, rpmMacroEntry me, const char * se); typedef size_t (*parseFunc)(MacroBuf mb, rpmMacroEntry me, ARGV_t argv);
/* forward ref */ /* forward ref */
static int expandMacro(MacroBuf mb, const char *src, size_t slen); static int expandMacro(MacroBuf mb, const char *src, size_t slen);
@ -502,8 +502,9 @@ static void mbAppendStr(MacroBuf mb, const char *str)
mb->nb -= len; mb->nb -= len;
} }
static size_t doDnl(MacroBuf mb, rpmMacroEntry me, const char * se) static size_t doDnl(MacroBuf mb, rpmMacroEntry me, ARGV_t argv)
{ {
const char *se = argv[1];
const char *start = se, *end; const char *start = se, *end;
const char *s = se; const char *s = se;
while (*s && !iseol(*s)) while (*s && !iseol(*s))
@ -747,12 +748,13 @@ exit:
/** /**
* Parse (and execute) macro undefinition. * Parse (and execute) macro undefinition.
* @param mb macro expansion state * @param mb macro expansion state
* @param se macro name to undefine * @param argv macro arguments
* @return number of consumed characters * @return number of consumed characters
*/ */
static size_t static size_t
doUndefine(MacroBuf mb, rpmMacroEntry me, const char * se) doUndefine(MacroBuf mb, rpmMacroEntry me, ARGV_t argv)
{ {
const char *se = argv[1];
const char *start = se; const char *start = se;
const char *s = se; const char *s = se;
char *buf = xmalloc(strlen(s) + 1); char *buf = xmalloc(strlen(s) + 1);
@ -778,18 +780,21 @@ exit:
return se - start; return se - start;
} }
static size_t doDef(MacroBuf mb, rpmMacroEntry me, const char *se) static size_t doDef(MacroBuf mb, rpmMacroEntry me, ARGV_t argv)
{ {
const char *se = argv[1];
return doDefine(mb, se, mb->level, 0); return doDefine(mb, se, mb->level, 0);
} }
static size_t doGlobal(MacroBuf mb, rpmMacroEntry me, const char * se) static size_t doGlobal(MacroBuf mb, rpmMacroEntry me, ARGV_t argv)
{ {
const char *se = argv[1];
return doDefine(mb, se, RMIL_GLOBAL, 1); return doDefine(mb, se, RMIL_GLOBAL, 1);
} }
static size_t doDump(MacroBuf mb, rpmMacroEntry me, const char * se) static size_t doDump(MacroBuf mb, rpmMacroEntry me, ARGV_t argv)
{ {
const char *se = argv[1];
const char *start = se; const char *start = se;
rpmDumpMacroTable(mb->mc, NULL); rpmDumpMacroTable(mb->mc, NULL);
while (iseol(*se)) while (iseol(*se))
@ -1348,10 +1353,9 @@ doExpandThisMacro(MacroBuf mb, rpmMacroEntry me, ARGV_t args, size_t *parsed)
_("argument expected") : _("unexpected argument")); _("argument expected") : _("unexpected argument"));
goto exit; goto exit;
} }
const char *arg = havearg ? args[1] : NULL;
if (me->flags & ME_PARSE) { if (me->flags & ME_PARSE) {
parseFunc parse = me->func; parseFunc parse = me->func;
size_t np = parse(mb, me, arg); size_t np = parse(mb, me, args);
if (parsed) if (parsed)
*parsed = np; *parsed = np;
} else { } else {