← Commit list

64aa86b72

Denys Vlasenko
Denys Vlasenko
2021-09-07
SUCCESS Duration: 153s

Subject

ash: LINENO starts from 0 in -c SCRIPT mode

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

shell/ash.c +1 -1shell/ash_test/ash-misc/control_char3.right +1 -1shell/ash_test/ash-misc/control_char4.right +1 -1shell/ash_test/ash-misc/shift1.right +1 -1shell/ash_test/ash-misc/tickquote1.right +1 -1shell/ash_test/ash-parsing/groups_and_keywords2.right +1 -1shell/ash_test/ash-psubst/emptytick.right +2 -2shell/ash_test/ash-vars/param_expand_alt.right +2 -2shell/ash_test/ash-vars/param_expand_assign.right +7 -7shell/ash_test/ash-vars/param_expand_bash_substring.right +5 -5shell/ash_test/ash-vars/param_expand_default.right +1 -1shell/ash_test/ash-vars/param_expand_indicate_error.right +16 -16shell/ash_test/ash-vars/var6.right +2 -2shell/ash_test/ash-vars/var_LINENO3.right +2 -0shell/ash_test/ash-vars/var_LINENO3.tests +2 -0shell/hush_test/hush-vars/var_LINENO3.right +2 -0shell/hush_test/hush-vars/var_LINENO3.tests +2 -0
shell/ash.c+1 -1
@@ -14698,7 +14698,7 @@ int ash_main(int argc UNUSED_PARAM, char **argv)
// ^^ not necessary since now we special-case fd 0
// in save_fd_on_redirect()
- lineno = 1;
+ lineno = 0; // bash compat
// dash: evalstring(minusc, sflag ? 0 : EV_EXIT);
// The above makes
// ash -sc 'echo $-'
shell/ash_test/ash-misc/control_char3.right+1 -1
@@ -1 +1 @@
-SHELL: line 1: : not found
+SHELL: line 0: : not found
shell/ash_test/ash-misc/control_char4.right+1 -1
@@ -1 +1 @@
-SHELL: line 1: -: not found
+SHELL: line 0: -: not found
shell/ash_test/ash-misc/shift1.right+1 -1
@@ -1,5 +1,5 @@
2 3 4
-0: shift: line 1: Illegal number: -1
+0: shift: line 0: Illegal number: -1
1 2 3 4
2 3 4
3 4
shell/ash_test/ash-misc/tickquote1.right+1 -1
@@ -1 +1 @@
-./tickquote1.tests: line 1: syntax error: unterminated quoted string
+./tickquote1.tests: line 0: syntax error: unterminated quoted string
shell/ash_test/ash-parsing/groups_and_keywords2.right+1 -1
@@ -1,3 +1,3 @@
-./groups_and_keywords2.tests: eval: line 1: syntax error: unexpected ")"
+./groups_and_keywords2.tests: eval: line 2: syntax error: unexpected ")"
Fail:2
./groups_and_keywords2.tests: line 8: syntax error: unexpected ")"
shell/ash_test/ash-psubst/emptytick.right+2 -2
@@ -1,8 +1,8 @@
0
0
-./emptytick.tests: line 1: : Permission denied
+./emptytick.tests: line 2: : Permission denied
127
-./emptytick.tests: line 1: : Permission denied
+./emptytick.tests: line 3: : Permission denied
127
0
0
shell/ash_test/ash-vars/param_expand_alt.right+2 -2
@@ -1,5 +1,5 @@
-SHELL: line 1: syntax error: bad substitution
-SHELL: line 1: syntax error: bad substitution
+SHELL: line 0: syntax error: bad substitution
+SHELL: line 0: syntax error: bad substitution
__
_z_ _z_
_ _ _ _ _
shell/ash_test/ash-vars/param_expand_assign.right+7 -7
@@ -1,11 +1,11 @@
-SHELL: line 1: syntax error: bad substitution
-SHELL: line 1: syntax error: bad substitution
-SHELL: line 1: syntax error: bad substitution
+SHELL: line 0: syntax error: bad substitution
+SHELL: line 0: syntax error: bad substitution
+SHELL: line 0: syntax error: bad substitution
0
-SHELL: line 1: 1: bad variable name
-SHELL: line 1: 1: bad variable name
-SHELL: line 1: 1: bad variable name
-SHELL: line 1: 1: bad variable name
+SHELL: line 0: 1: bad variable name
+SHELL: line 0: 1: bad variable name
+SHELL: line 0: 1: bad variable name
+SHELL: line 0: 1: bad variable name
_aa
_aa
_aa
shell/ash_test/ash-vars/param_expand_bash_substring.right+5 -5
@@ -1,8 +1,8 @@
-SHELL: line 1: syntax error: bad substitution
-SHELL: line 1: syntax error: bad substitution
-SHELL: line 1: syntax error: bad substitution
-SHELL: line 1: syntax error: bad substitution
-SHELL: line 1: syntax error: missing '}'
+SHELL: line 0: syntax error: bad substitution
+SHELL: line 0: syntax error: bad substitution
+SHELL: line 0: syntax error: bad substitution
+SHELL: line 0: syntax error: bad substitution
+SHELL: line 0: syntax error: missing '}'
0
1 =||
1:1 =||
shell/ash_test/ash-vars/param_expand_default.right+1 -1
@@ -1,4 +1,4 @@
-SHELL: line 1: syntax error: bad substitution
+SHELL: line 0: syntax error: bad substitution
_0 _0
_ _ _ _word _word
_aaaa _aaaa _aaaa _aaaa _aaaa
shell/ash_test/ash-vars/param_expand_indicate_error.right+16 -16
@@ -1,14 +1,14 @@
-SHELL: line 1: syntax error: bad substitution
+SHELL: line 0: syntax error: bad substitution
1
0
====
_
-SHELL: line 1: 1: parameter not set
-SHELL: line 1: 1: parameter not set or null
-SHELL: line 1: 1: message1
-SHELL: line 1: 1: message1
-SHELL: line 1: 1: unset!
-SHELL: line 1: 1: null or unset!
+SHELL: line 0: 1: parameter not set
+SHELL: line 0: 1: parameter not set or null
+SHELL: line 0: 1: message1
+SHELL: line 0: 1: message1
+SHELL: line 0: 1: unset!
+SHELL: line 0: 1: null or unset!
====
_aaaa
_aaaa
@@ -19,20 +19,20 @@ _aaaa
_aaaa
====
_
-SHELL: line 1: f: parameter not set
-SHELL: line 1: f: parameter not set or null
-SHELL: line 1: f: message3
-SHELL: line 1: f: message3
-SHELL: line 1: f: unset!
-SHELL: line 1: f: null or unset!
+SHELL: line 0: f: parameter not set
+SHELL: line 0: f: parameter not set or null
+SHELL: line 0: f: message3
+SHELL: line 0: f: message3
+SHELL: line 0: f: unset!
+SHELL: line 0: f: null or unset!
====
_
_
-SHELL: line 1: f: parameter not set or null
+SHELL: line 0: f: parameter not set or null
_
-SHELL: line 1: f: message4
+SHELL: line 0: f: message4
_
-SHELL: line 1: f: null or unset!
+SHELL: line 0: f: null or unset!
====
_fff
_fff
shell/ash_test/ash-vars/var6.right+2 -2
@@ -1,2 +1,2 @@
-SHELL: line 1: syntax error: bad substitution
-SHELL: line 1: syntax error: bad substitution
+SHELL: line 0: syntax error: bad substitution
+SHELL: line 0: syntax error: bad substitution
shell/ash_test/ash-vars/var_LINENO3.right+2 -0
@@ -0,0 +1,2 @@
+LINENO starts from 0 in -c
+and increments on next line: 1
shell/ash_test/ash-vars/var_LINENO3.tests+2 -0
@@ -0,0 +1,2 @@
+$THIS_SH -c 'echo "LINENO starts from $LINENO in -c"
+echo "and increments on next line: $LINENO"'
shell/hush_test/hush-vars/var_LINENO3.right+2 -0
@@ -0,0 +1,2 @@
+LINENO starts from 0 in -c
+and increments on next line: 1
shell/hush_test/hush-vars/var_LINENO3.tests+2 -0
@@ -0,0 +1,2 @@
+$THIS_SH -c 'echo "LINENO starts from $LINENO in -c"
+echo "and increments on next line: $LINENO"'