summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2010-05-22 04:05:02 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2010-05-22 04:05:02 (GMT)
commit8a33679694b0fdf459d69868f85c081cab5687cb (patch)
treebe6d2ea8d9a5132d82939892736d2531877632e8
parent1e811b12317d0eab4e78d848caa640cca497a0a7 (diff)
downloadbusybox-8a33679694b0fdf459d69868f85c081cab5687cb.tar.gz
busybox-8a33679694b0fdf459d69868f85c081cab5687cb.tar.bz2
hush: fix "hush -c 'echo $#'" showing -1
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--shell/hush.c1
-rw-r--r--shell/hush_test/hush-vars/param_expand_len.right5
-rwxr-xr-xshell/hush_test/hush-vars/param_expand_len.tests7
3 files changed, 11 insertions, 2 deletions
diff --git a/shell/hush.c b/shell/hush.c
index 41d5fca..7645a34 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -7080,7 +7080,6 @@ int hush_main(int argc, char **argv)
/* -c 'script' (no params): prevent empty $0 */
G.global_argv--; /* points to argv[i] of 'script' */
G.global_argv[0] = argv[0];
- G.global_argc--;
} /* else -c 'script' ARG0 [ARG1...]: $0 is ARG0 */
init_sigmasks();
parse_and_run_string(optarg);
diff --git a/shell/hush_test/hush-vars/param_expand_len.right b/shell/hush_test/hush-vars/param_expand_len.right
index 2d633a1..96e8cb5 100644
--- a/shell/hush_test/hush-vars/param_expand_len.right
+++ b/shell/hush_test/hush-vars/param_expand_len.right
@@ -1,4 +1,9 @@
+0
+0
+1
+Make sure len parsing doesnt break arg count
0 0
4 4
+Testing len op
4 3 2 1 0 0
0 3 0
diff --git a/shell/hush_test/hush-vars/param_expand_len.tests b/shell/hush_test/hush-vars/param_expand_len.tests
index 90f47d2..fe20a45 100755
--- a/shell/hush_test/hush-vars/param_expand_len.tests
+++ b/shell/hush_test/hush-vars/param_expand_len.tests
@@ -1,9 +1,14 @@
-# make sure len parsing doesnt break arg count
+"$THIS_SH" -c 'echo $#'
+"$THIS_SH" -c 'echo $#' arg0
+"$THIS_SH" -c 'echo $#' arg0 arg1
+
+echo Make sure len parsing doesnt break arg count
set --
echo $# ${#}
set -- aaaa bbb cc d
echo $# ${#}
+echo Testing len op
echo ${#1} ${#2} ${#3} ${#4} ${#5} ${#6}
unset e