From a67a9627d0ada5214d43d06a34387cd9604108c8 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Thu, 20 Aug 2009 03:38:58 +0200 Subject: [PATCH 1/1] hush: do not process options after non-option args Signed-off-by: Denys Vlasenko --- shell/hush.c | 2 +- shell/hush_test/hush-misc/opts1.right | 2 ++ shell/hush_test/hush-misc/opts1.tests | 5 +++++ 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 shell/hush_test/hush-misc/opts1.right create mode 100755 shell/hush_test/hush-misc/opts1.tests diff --git a/shell/hush.c b/shell/hush.c index 08e7f5052..b71e1b624 100644 --- a/shell/hush.c +++ b/shell/hush.c @@ -6461,7 +6461,7 @@ int hush_main(int argc, char **argv) /* http://www.opengroup.org/onlinepubs/9699919799/utilities/sh.html */ builtin_argc = 0; while (1) { - opt = getopt(argc, argv, "c:xins" + opt = getopt(argc, argv, "+c:xins" #if !BB_MMU "<:$:R:V:" # if ENABLE_HUSH_FUNCTIONS diff --git a/shell/hush_test/hush-misc/opts1.right b/shell/hush_test/hush-misc/opts1.right new file mode 100644 index 000000000..4da75737d --- /dev/null +++ b/shell/hush_test/hush-misc/opts1.right @@ -0,0 +1,2 @@ +Param1: >-10qwertyuiop< +Done diff --git a/shell/hush_test/hush-misc/opts1.tests b/shell/hush_test/hush-misc/opts1.tests new file mode 100755 index 000000000..45a23d66b --- /dev/null +++ b/shell/hush_test/hush-misc/opts1.tests @@ -0,0 +1,5 @@ +if test $# = 0; then + exec "$THIS_SH" $0 -10qwertyuiop +fi +echo "Param1: >$1<" +echo Done -- 2.25.1