rpmInitMacrofileGlob: expand argument before processing

2005-06-23 14:09:04 +00:00 · 2005-06-23 14:09:04 +00:00 · cb69eafd41
commit cb69eafd41
parent 7f68fe2b17
1 changed files with 4 additions and 1 deletions
--- a/rpmio/macro.c
+++ b/rpmio/macro.c
@ -1644,8 +1644,9 @@ rpmInitMacrofile (const char *macrofile)
 }

 static void
-rpmInitMacrofileGlob (const char *macrofile)
+rpmInitMacrofileGlob (const char *arg)
 {
+	const char *macrofile = rpmExpand (arg, NULL);
 	int is_local = strchr (macrofile, '~') ? 1 : 0;

 	if (is_local || strchr (macrofile, '*'))
@ -1681,6 +1682,8 @@ rpmInitMacrofileGlob (const char *macrofile)
 	}
 	else
 		rpmInitMacrofile (macrofile);
+
+	_free (macrofile);
 }

 void