8a3367969
Denys Vlasenko
2010-05-22
Subject
hush: fix "hush -c 'echo $#'" showing -1
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
shell/hush.c +0 -1shell/hush_test/hush-vars/param_expand_len.right +5 -0shell/hush_test/hush-vars/param_expand_len.tests +6 -1
shell/hush.c+0 -1
| @@ -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); | |
shell/hush_test/hush-vars/param_expand_len.right+5 -0
| @@ -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 | |
shell/hush_test/hush-vars/param_expand_len.tests+6 -1
| @@ -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 | |