From 6016181b68a9e8a9fb99893242851128b6bd5656 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Tue, 29 Aug 2017 14:32:17 +0200 Subject: hush: GETOPT_RESET() _after_ getopts too. NOEXEC'ed applets which use getopt() need this. function old new delta builtin_getopts 403 413 +10 Signed-off-by: Denys Vlasenko --- shell/hush.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'shell/hush.c') diff --git a/shell/hush.c b/shell/hush.c index 8e00225..d27550b 100644 --- a/shell/hush.c +++ b/shell/hush.c @@ -9956,7 +9956,7 @@ Test that VAR is a valid variable name? * until we get Nth result (or failure). * (N == G.getopt_count is reset to 0 whenever OPTIND is [un]set). */ - optind = 0; /* reset getopt() state */ + GETOPT_RESET(); count = 0; n = string_array_len(argv); do { @@ -9971,6 +9971,7 @@ Test that VAR is a valid variable name? /* Set OPTIND. Prevent resetting of the magic counter! */ set_local_var_from_halves("OPTIND", utoa(optind)); G.getopt_count = count; /* "next time, give me N+1'th result" */ + GETOPT_RESET(); /* just in case */ /* Set OPTARG */ /* Always set or unset, never left as-is, even on exit/error: -- cgit v1.1