ash: LINENO starts from 0 in -c SCRIPT mode

The var_LINENO3.tests fails for hush: it does start from 0, but does not increment.

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

8 files changed, 37 insertions, 33 deletions

diff --git a/shell/ash_test/ash-vars/param_expand_alt.right b/shell/ash_test/ash-vars/param_expand_alt.right
index 1303f8064..d10f1206f 100644
--- a/shell/ash_test/ash-vars/param_expand_alt.right
+++ b/shell/ash_test/ash-vars/param_expand_alt.right
@@ -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_
 _ _ _ _ _
diff --git a/shell/ash_test/ash-vars/param_expand_assign.right b/shell/ash_test/ash-vars/param_expand_assign.right
index 6e9ea1379..52eaef9f8 100644
--- a/shell/ash_test/ash-vars/param_expand_assign.right
+++ b/shell/ash_test/ash-vars/param_expand_assign.right
@@ -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
diff --git a/shell/ash_test/ash-vars/param_expand_bash_substring.right b/shell/ash_test/ash-vars/param_expand_bash_substring.right
index 687dd9002..22a0b2881 100644
--- a/shell/ash_test/ash-vars/param_expand_bash_substring.right
+++ b/shell/ash_test/ash-vars/param_expand_bash_substring.right
@@ -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  =||
diff --git a/shell/ash_test/ash-vars/param_expand_default.right b/shell/ash_test/ash-vars/param_expand_default.right
index 7a42f67e8..0852105ca 100644
--- a/shell/ash_test/ash-vars/param_expand_default.right
+++ b/shell/ash_test/ash-vars/param_expand_default.right
@@ -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
diff --git a/shell/ash_test/ash-vars/param_expand_indicate_error.right b/shell/ash_test/ash-vars/param_expand_indicate_error.right
index 33afacee0..53ea07181 100644
--- a/shell/ash_test/ash-vars/param_expand_indicate_error.right
+++ b/shell/ash_test/ash-vars/param_expand_indicate_error.right
@@ -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
diff --git a/shell/ash_test/ash-vars/var6.right b/shell/ash_test/ash-vars/var6.right
index b37417fa1..e83f7b5eb 100644
--- a/shell/ash_test/ash-vars/var6.right
+++ b/shell/ash_test/ash-vars/var6.right
@@ -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
diff --git a/shell/ash_test/ash-vars/var_LINENO3.right b/shell/ash_test/ash-vars/var_LINENO3.right
new file mode 100644
index 000000000..198c3cc99
--- /dev/null
+++ b/shell/ash_test/ash-vars/var_LINENO3.right
@@ -0,0 +1,2 @@
+LINENO starts from 0 in -c
+and increments on next line: 1
diff --git a/shell/ash_test/ash-vars/var_LINENO3.tests b/shell/ash_test/ash-vars/var_LINENO3.tests
new file mode 100755
index 000000000..4502edfe0
--- /dev/null
+++ b/shell/ash_test/ash-vars/var_LINENO3.tests
@@ -0,0 +1,2 @@
+$THIS_SH -c 'echo "LINENO starts from $LINENO in -c"
+echo "and increments on next line: $LINENO"'