Expand $LINENO to the current line number. This is required by SUSv3's "User

Portability Utilities" option.

Often configure scripts generated by the autotools test if $LINENO works and
refuse to use /bin/sh if not.

Package test run by:	pav

1 files changed, 8 insertions, 1 deletions

diff --git a/bin/sh/expand.c b/bin/sh/expand.c
index 1bd7079..2f0b9fd 100644
--- a/bin/sh/expand.c
+++ b/bin/sh/expand.c
@@ -638,7 +638,13 @@ evalvar(char *p, int flag)
 		special = 1;
 	p = strchr(p, '=') + 1;
 again: /* jump here after setting a variable with ${var=text} */
-	if (special) {
+	if (varflags & VSLINENO) {
+		set = 1;
+		special = 0;
+		val = var;
+		p[-1] = '\0';	/* temporarily overwrite '=' to have \0
+				   terminated string */
+	} else if (special) {
 		set = varisset(var, varflags & VSNUL);
 		val = NULL;
 	} else {
@@ -768,6 +774,7 @@ record:
 	default:
 		abort();
 	}
+	p[-1] = '=';	/* recover overwritten '=' */
 
 	if (subtype != VSNORMAL) {	/* skip to end of alternative */
 		int nesting = 1;