rc: show line numbers on error

This change provides a location for errors
like 'null list in concatenation'.

1 files changed, 14 insertions, 2 deletions

diff --git a/sys/src/cmd/rc/simple.c b/sys/src/cmd/rc/simple.c
index 8971f201f..3987dbe5a 100644
--- a/sys/src/cmd/rc/simple.c
+++ b/sys/src/cmd/rc/simple.c
@@ -11,8 +11,15 @@
  */
 int
 exitnext(void){
-	union code *c=&runq->code[runq->pc];
-	while(c->f==Xpopredir || c->f==Xunlocal) c++;
+	code *c=&runq->code[runq->pc];
+	while(1){
+		if(c->f==Xpopredir || c->f==Xunlocal)
+			c++;
+		else if(c->f==Xsrcline || c->f==Xsrcfile)
+			c += 2;
+		else
+			break;
+	}
 	return c->f==Xexit;
 }
 
@@ -260,6 +267,7 @@ void
 execcmds(io *f)
 {
 	static int first = 1;
+
 	if(first){
 		rdcmds[0].i = 1;
 		rdcmds[1].f = Xrdcmds;
@@ -319,6 +327,7 @@ execdot(void)
 	}
 	else
 		eflagok = 1;
+
 	popword();
 	if(p->argv->words && strcmp(p->argv->words->word, "-i")==0){
 		iflag = 1;
@@ -354,6 +363,9 @@ execdot(void)
 		Xerror(".: can't open");
 		return;
 	}
+
+	lexline = 1;
+
 	/* set up for a new command loop */
 	start(dotcmds, 1, (struct var *)0);
 	pushredir(RCLOSE, fd, 0);