rpmInitMacrofileGlob: expand argument before processing

This commit is contained in:
Дмитрий Левин 2005-06-23 14:09:04 +00:00
parent 7f68fe2b17
commit cb69eafd41

View File

@ -1644,8 +1644,9 @@ rpmInitMacrofile (const char *macrofile)
} }
static void static void
rpmInitMacrofileGlob (const char *macrofile) rpmInitMacrofileGlob (const char *arg)
{ {
const char *macrofile = rpmExpand (arg, NULL);
int is_local = strchr (macrofile, '~') ? 1 : 0; int is_local = strchr (macrofile, '~') ? 1 : 0;
if (is_local || strchr (macrofile, '*')) if (is_local || strchr (macrofile, '*'))
@ -1681,6 +1682,8 @@ rpmInitMacrofileGlob (const char *macrofile)
} }
else else
rpmInitMacrofile (macrofile); rpmInitMacrofile (macrofile);
_free (macrofile);
} }
void void