From 5c7be9ff81df1d0bd03b0baa6bdb29a9328a707e Mon Sep 17 00:00:00 2001
From: "tim.newsham" <tim.newsham@44b2186c-a14b-0410-8c95-595313601b93>
Date: Thu, 8 May 2008 04:49:45 +0000
Subject: [PATCH] - more fixes for sh.

---
 notes/notes.txt | 1 +
 pages/e11-01    | 2 +-
 pages/e11-03    | 2 +-
 pages/e11-05    | 4 ++--
 pages/e11-06    | 6 +++---
 pages/e11-07    | 2 +-
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/notes/notes.txt b/notes/notes.txt
index bd47806..d06837a 100644
--- a/notes/notes.txt
+++ b/notes/notes.txt
@@ -289,6 +289,7 @@ e11-04
 e11-06
    - comment after "rts pc" uses "ro" instead of "r0", left as is.
    - towards enf of page "add r01,r0"  what is this supposed to be?
+     I think this is "add r1,r0" based on surrounding code.  trying that.
 ---------------------
 e12-01
    - "rko5" in comments left as is (vs "rk05")
diff --git a/pages/e11-01 b/pages/e11-01
index e47e7df..711b774 100644
--- a/pages/e11-01
+++ b/pages/e11-01
@@ -20,7 +20,7 @@
 	sys	open; 0:..; 0 / open it
 	bec	1f / branch if no error
 	jsr	r5,error / error in file name
-		<Input not found\n\0>: .even
+		<Input not found\n\0>; .even
 	sys	exit
 1:
 	clr	at / clear prompt character, if reading non-tty
diff --git a/pages/e11-03 b/pages/e11-03
index 0edd429..a3cae74 100644
--- a/pages/e11-03
+++ b/pages/e11-03
@@ -7,7 +7,7 @@
 	clr	r1 / set r1 to zero to dkip wait
 	rts	pc / and return
 2:
-	jsr	r5,chcom: qloqin / is command login?
+	jsr	r5,chcom; glogin / is command login?
 		br 2f / not loqin, go to fork
 	sys	exec; parbuf; parp / exec login
 	sys	exec; binpb; parp / or /bin/login
diff --git a/pages/e11-05 b/pages/e11-05
index 5ad5832..bb70476 100644
--- a/pages/e11-05
+++ b/pages/e11-05
@@ -15,7 +15,7 @@
 	bes	2f / branch if it doesn't
 	mov	$shell,parp-2 / does exist, not executable
 	mov	$binpb,parp / so it must be
-	svs	exec; shell; parp-2 / a command file, get it with
+	sys	exec; shell; parp-2 / a command file, get it with
 		                    / sh /bin/x (if x name of file)
 2:
 	jsr	r5,error / a return for exec is the diagnostic
@@ -29,7 +29,7 @@
 delim:
 	cmp	r0,$'\n / is character a newline
 	beq	1f
-	cmp	r0,S'& / is it &
+	cmp	r0,$'& / is it &
 	beq	1f / yes
 	cmp	r0,$'; / is it ;
 	beq	1f / yes
diff --git a/pages/e11-06 b/pages/e11-06
index 21f06ce..38137cc 100644
--- a/pages/e11-06
+++ b/pages/e11-06
@@ -32,8 +32,8 @@
 3:
 	jsr	pc,getc / get digit after $
 	sub	$'0,r0 / strip off zone bits
-	cmp	r0,$9, / compare with digit 9 
-	clos	1f / less than or equal 9
+	cmp	r0,$9. / compare with digit 9 
+	blos	1f / less than or equal 9
 	mov	$9.,r0 / if larger than 9, force 9
 1:
 	mov	shellarg,r1 / get pointer to stack for
@@ -42,7 +42,7 @@
 	cmp	r0,(r1) / is it less than # of args in this call
 	bge	getc / no, ignore it. so this $n is not replaced
 	asl	r0 / yes, multiply by 2 (to skip words)
-	add	r01,r0 / form pointer to arg pointer (-2)
+	add	r1,r0 / form pointer to arg pointer (-2)
 	mov	2(r0),param / move arg pointer to param
 	br	getc / go to get substitution arg for $n
 getbuf:
diff --git a/pages/e11-07 b/pages/e11-07
index 4484fdd..e3f78bf 100644
--- a/pages/e11-07
+++ b/pages/e11-07
@@ -36,7 +36,7 @@ binpb:
 parbuf: .=.+1000.
 	.even
 param:	.=.+2
-glflaq:	.=.+2
+glflag:	.=.+2
 infile: .=.+2 
 outfile:.=.+2
 	.=.+2 / room for glob