From 4879056d84b45436df59f573382872f649bc1b71 Mon Sep 17 00:00:00 2001
From: tribby <tribby>
Date: Mon, 2 Nov 1998 17:40:56 +0000
Subject: [PATCH] Changes for gsh version 2.0d6:

Fixed defect introduced in version 2.0d5: when a background job completed
while gsh was waiting for command line input, gsh would print a bogus error
message and quit.
---
 bin/gsh/UpdateLog | 7 +++++++
 bin/gsh/edit.asm  | 5 +++--
 bin/gsh/gsh.rez   | 4 ++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/bin/gsh/UpdateLog b/bin/gsh/UpdateLog
index ae6fcf9..9f1ebb7 100644
--- a/bin/gsh/UpdateLog
+++ b/bin/gsh/UpdateLog
@@ -1,6 +1,13 @@
 GSH 2.0 UPDATES
 ^^^^^^^^^^^^^^^
 
+Oct 29 98    [dmt] Defect introduced into 2.0d5 fixed: when background job
+	     completed, GetCmdLine thought there was an error on stdin. It
+	     printed a bogus error message and then quit.
+
+Oct 26 98    [dmt] Changes to this point checked-in to master archive.
+	     Released as version 2.0d5
+
 Oct 10 98    [dmt] Found race condition: when forked process completes
 	     quickly, the parent process may not ever receive its completion
 	     signal. Fix: ensure process exists by calling kill(pid,0)
diff --git a/bin/gsh/edit.asm b/bin/gsh/edit.asm
index 6cdba09..a78195a 100644
--- a/bin/gsh/edit.asm
+++ b/bin/gsh/edit.asm
@@ -6,7 +6,7 @@
 *   Jawaid Bazyar
 *   Tim Meekins
 *
-* $Id: edit.asm,v 1.7 1998/10/26 17:04:50 tribby Exp $
+* $Id: edit.asm,v 1.8 1998/11/02 17:40:56 tribby Exp $
 *
 **************************************************************************
 *
@@ -123,7 +123,8 @@ nextchar	jsr	cursoron
 	sta	4
 	ldx	signalled	If signal was received,
 	beq	nextchar2
-	jsr	cmdsig	 acknowledge it.
+	jsr	cmdsig	 acknowledge it
+	bra	cmdloop	  and continue reading.
 
 nextchar2	jsr	cursoroff
 	lda	4	Get results of getchar.
diff --git a/bin/gsh/gsh.rez b/bin/gsh/gsh.rez
index 6711a50..323feea 100644
--- a/bin/gsh/gsh.rez
+++ b/bin/gsh/gsh.rez
@@ -1,7 +1,7 @@
 /*
  * Resources for version and comment
  *
- * $Id: gsh.rez,v 1.6 1998/10/26 17:04:50 tribby Exp $
+ * $Id: gsh.rez,v 1.7 1998/11/02 17:40:56 tribby Exp $
  */
 
 #define PROG "gsh"
@@ -16,7 +16,7 @@
 resource rVersion (1, purgeable3) {
 	{ 2, 0, 0,	/* Version 2.0.0 */
 	  development,	/* development|alpha|beta|final|release */
-	  5 },		/* non-final release number */
+	  6 },		/* non-final release number */
 	verUS,		/* Country */
 	PROG,		/* Program name */
         DESC