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

Refactor %{expand:...} handling to its own function 

%{expand:...} is a rather special built-in as its *purpose* is to
double-expand its argument, so it makes sense to separate it from
the others.

No functional changes intended here.
This commit is contained in:
Panu Matilainen 2020-02-10 13:28:03 +02:00
parent 227cddca88
commit b551b256ea
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
rpmio/macro.c
View File

@ -132,6 +132,8 @@ static void pushMacro(rpmMacroContext mc,
const char * n, const char * o, const char * b, int level, int flags); const char * n, const char * o, const char * b, int level, int flags);
static void popMacro(rpmMacroContext mc, const char * n); static void popMacro(rpmMacroContext mc, const char * n);
static int loadMacroFile(rpmMacroContext mc, const char * fn); static int loadMacroFile(rpmMacroContext mc, const char * fn);
static void doExpand(MacroBuf mb, int chkexist, int negate,
const char * f, size_t fn, const char * g, size_t gn);
static void doFoo(MacroBuf mb, int chkexist, int negate, static void doFoo(MacroBuf mb, int chkexist, int negate,
const char * f, size_t fn, const char * g, size_t gn); const char * f, size_t fn, const char * g, size_t gn);
static void doLoad(MacroBuf mb, int chkexist, int negate, static void doLoad(MacroBuf mb, int chkexist, int negate,
@ -566,7 +568,7 @@ static struct builtins_s {
{ STR_AND_LEN("dump"), NULL, doDump, 0 }, { STR_AND_LEN("dump"), NULL, doDump, 0 },
{ STR_AND_LEN("echo"), doOutput, NULL, 1 }, { STR_AND_LEN("echo"), doOutput, NULL, 1 },
{ STR_AND_LEN("error"), doOutput, NULL, 1 }, { STR_AND_LEN("error"), doOutput, NULL, 1 },
{ STR_AND_LEN("expand"), doFoo, NULL, 1 }, { STR_AND_LEN("expand"), doExpand, NULL, 1 },
{ STR_AND_LEN("expr"), doFoo, NULL, 1 }, { STR_AND_LEN("expr"), doFoo, NULL, 1 },
{ STR_AND_LEN("getconfdir"),doFoo, NULL, 0 }, { STR_AND_LEN("getconfdir"),doFoo, NULL, 0 },
{ STR_AND_LEN("getenv"), doFoo, NULL, 1 }, { STR_AND_LEN("getenv"), doFoo, NULL, 1 },
@ -1135,6 +1137,17 @@ exit:
free(buf); free(buf);
} }
static void doExpand(MacroBuf mb, int chkexist, int negate,
const char * f, size_t fn, const char * g, size_t gn)
{
if (gn > 0) {
char *buf;
expandThis(mb, g, gn, &buf);
expandMacro(mb, buf, 0);
free(buf);
}
}
/** /**
* Execute macro primitives. * Execute macro primitives.
* @param mb macro expansion state * @param mb macro expansion state
@ -1204,7 +1217,7 @@ doFoo(MacroBuf mb, int chkexist, int negate, const char * f, size_t fn,
} else if (STREQ("suffix", f, fn)) { } else if (STREQ("suffix", f, fn)) {
if ((b = strrchr(buf, '.')) != NULL) if ((b = strrchr(buf, '.')) != NULL)
b++; b++;
} else if (STREQ("expand", f, fn) || STREQ("verbose", f, fn)) { } else if STREQ("verbose", f, fn) {
b = buf; b = buf;
} else if (STREQ("expr", f, fn)) { } else if (STREQ("expr", f, fn)) {
char *expr = rpmExprStr(buf, 0); char *expr = rpmExprStr(buf, 0);