diff options
-rw-r--r-- | shell/hush.c | 1 | ||||
-rw-r--r-- | shell/hush_test/hush-vars/param_expand_len.right | 5 | ||||
-rwxr-xr-x | shell/hush_test/hush-vars/param_expand_len.tests | 7 |
3 files changed, 11 insertions, 2 deletions
diff --git a/shell/hush.c b/shell/hush.c index 41d5fcab2..7645a34a4 100644 --- a/shell/hush.c +++ b/shell/hush.c | |||
@@ -7080,7 +7080,6 @@ int hush_main(int argc, char **argv) | |||
7080 | /* -c 'script' (no params): prevent empty $0 */ | 7080 | /* -c 'script' (no params): prevent empty $0 */ |
7081 | G.global_argv--; /* points to argv[i] of 'script' */ | 7081 | G.global_argv--; /* points to argv[i] of 'script' */ |
7082 | G.global_argv[0] = argv[0]; | 7082 | G.global_argv[0] = argv[0]; |
7083 | G.global_argc--; | ||
7084 | } /* else -c 'script' ARG0 [ARG1...]: $0 is ARG0 */ | 7083 | } /* else -c 'script' ARG0 [ARG1...]: $0 is ARG0 */ |
7085 | init_sigmasks(); | 7084 | init_sigmasks(); |
7086 | parse_and_run_string(optarg); | 7085 | 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 2d633a148..96e8cb59b 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 @@ | |||
1 | 0 | ||
2 | 0 | ||
3 | 1 | ||
4 | Make sure len parsing doesnt break arg count | ||
1 | 0 0 | 5 | 0 0 |
2 | 4 4 | 6 | 4 4 |
7 | Testing len op | ||
3 | 4 3 2 1 0 0 | 8 | 4 3 2 1 0 0 |
4 | 0 3 0 | 9 | 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 90f47d2fb..fe20a45e9 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 @@ | |||
1 | # make sure len parsing doesnt break arg count | 1 | "$THIS_SH" -c 'echo $#' |
2 | "$THIS_SH" -c 'echo $#' arg0 | ||
3 | "$THIS_SH" -c 'echo $#' arg0 arg1 | ||
4 | |||
5 | echo Make sure len parsing doesnt break arg count | ||
2 | set -- | 6 | set -- |
3 | echo $# ${#} | 7 | echo $# ${#} |
4 | set -- aaaa bbb cc d | 8 | set -- aaaa bbb cc d |
5 | echo $# ${#} | 9 | echo $# ${#} |
6 | 10 | ||
11 | echo Testing len op | ||
7 | echo ${#1} ${#2} ${#3} ${#4} ${#5} ${#6} | 12 | echo ${#1} ${#2} ${#3} ${#4} ${#5} ${#6} |
8 | 13 | ||
9 | unset e | 14 | unset e |