[PATCH 1/2] hush: expand variables before globbing in for loops

Sascha Hauer s.hauer at pengutronix.de
Thu Feb 21 09:17:13 EST 2013


The following does work:

for i in *; do echo $i; done

but the following does not:

a="*"; for i in $a; do echo $i; done

This is because globbing in for loops takes place before the variable
is expanded. Fix this by explicitly expanding the variables before globbing.

Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
---
 common/hush.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/common/hush.c b/common/hush.c
index 1f468f6..5927ad6 100644
--- a/common/hush.c
+++ b/common/hush.c
@@ -1008,7 +1008,11 @@ static int xglob(o_string *dest, int flags, glob_t *pglob, int glob_needed)
 			return 0;
 		}
 	} else if (glob_needed) {
-		gr = do_glob(dest->data, flags, NULL, pglob);
+		char *data;
+		data = insert_var_value(dest->data);
+		gr = do_glob(data, flags, NULL, pglob);
+		if (data != dest->data)
+			free(data);
 		debug("glob returned %d\n",gr);
 	} else {
 		gr = fake_glob(dest->data, flags, NULL, pglob);
-- 
1.7.10.4




More information about the barebox mailing list