Don Knuth's second round of patches.

diff --git a/NEWS b/NEWS
index dd5c84dc6c2f49cd2912ae89aec620c3ae92e040..701ccbf74562b19518848da217d083d00b30be2a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,9 @@
                        NEW IN THIS RELEASE
 
+       Release 0.23  (by Eric S. Raymond) 4 Mar 2003
+
+1. More fixes by Don Knith.  He found a bug in the type-propagation logic.
+
        Release 0.22  (by Eric S. Raymond) 4 Mar 2003
 
 1. Incorporated a minor fix patch from Donald Knuth.  Yes, *the*

diff --git a/cesspool.c b/cesspool.c
index aebea9aa4a0cece15c11b79108266a67a1cc5436..d21515e8eefa61d8e7513f6506781ccc5bf8a001 100644 (file)
--- a/cesspool.c
+++ b/cesspool.c
@@ -98,7 +98,7 @@ unsigned int pin(void)
     if (fgets(buf, BUFSIZ, stdin) == (char *)NULL)
        lose(E562, lineno, (char *)NULL);
     n = strlen(buf) - 1;
-    if (buf[n-1] == '\r')
+    if (n > 0 && buf[n-1] == '\r')
        --n;
     buf[n] = '\0';
 

diff --git a/perpetrate.c b/perpetrate.c
index a92c42439b29b4f31018e1b68d35d311497b3b91..551f9c2f39fadaa2511ccb029e77375e7105a8b5 100644 (file)
--- a/perpetrate.c
+++ b/perpetrate.c
@@ -310,6 +310,7 @@ int main(int argc, char *argv[])
             */
            for (tp = tuples; tp->type; tp++)
                if (tp->type == GETS || tp->type == RESIZE
+                    || tp->type == WRITE_IN || tp->type == READ_OUT
                    || tp->type == FORGET || tp->type == RESUME)
                    typecast(tp->u.node);