Ready to ship Don Knuth's fix.

diff --git a/NEWS b/NEWS
index 9a93c078c50e247f9808762c135f0dc95b04a514..dd5c84dc6c2f49cd2912ae89aec620c3ae92e040 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,15 @@
                        NEW IN THIS RELEASE
 
-       Release 0.21 (by Eric S. Raymond)
+       Release 0.22  (by Eric S. Raymond) 4 Mar 2003
+
+1. Incorporated a minor fix patch from Donald Knuth.  Yes, *the*
+Donald Knuth.  Seems he found a weakness in the code for handling
+comments, and fixed it to do multiline comments properly.  He also made
+some improvements to intercal.el, and contributed a test program.
+
+2. Updated build machinery.  This package now uses GNU autoconf.
+
+       Release 0.21 (by Eric S. Raymond) 30 July 2002
 
 1. Jonathan Nieder sent a grammar fix for BLR's old bug #5 (a bad spark-ears
 interaction.)

diff --git a/src/feh.c b/src/feh.c
index c070cbc0a67f472595fa2e3551213c16f913ef70..8203c2c2d180d7e6d4fd8e9070610a377e1531e5 100644 (file)
--- a/src/feh.c
+++ b/src/feh.c
@@ -698,6 +698,7 @@ static char *nice_text(char *texts[], int lines)
   if (lines < 1)
     lines = 1;
   for (cp = buf, i = 0 ; i < lines ; ++i) {
+    if (cp>buf+MAXNICEBUF-10) goto abort;
     if (i) {
       (*cp++) = '\\';
       (*cp++) = 'n';
@@ -706,6 +707,7 @@ static char *nice_text(char *texts[], int lines)
       (*cp++) = '\t';
     }
     for (text = texts[i] ; *text ; cp++, text++) {
+      if (cp>buf+MAXNICEBUF-10) goto abort;
       if(*text == '"' || *text == '\\') {
        (*cp++) = '\\';
       }
@@ -714,6 +716,11 @@ static char *nice_text(char *texts[], int lines)
   }
   *cp = '\0';
   return buf;
+abort: (*cp++) = '.';
+  (*cp++) = '.';
+  (*cp++) = '.';
+  *cp = '\0';
+  return buf;
 }
 
 static void emit_guard(tuple *tn, FILE *fp)

diff --git a/src/ick.y b/src/ick.y
index 9f74a6ba477899b358d6246a11edca08ec212d07..100ed85b110a419ab74856d6ff0976cc0b92d8ba 100644 (file)
--- a/src/ick.y
+++ b/src/ick.y
@@ -143,9 +143,9 @@ perform :    lvalue GETS expr       {ACTION($$, GETS,      cons(GETS,$1,$3));}
        |    RETRIEVE varlist   {ACTION($$, RETRIEVE,  rlist);}
        |    IGNORE varlist     {ACTION($$, IGNORE,    rlist);}
        |    REMEMBER varlist   {ACTION($$, REMEMBER,  rlist);}
-       |    ABSTAIN LABEL      {TARGET($$, ABSTAIN,   $2);}
+       |    ABSTAIN LABEL      {stbeginline=0; TARGET($$, ABSTAIN,   $2);}
        |    ABSTAIN gerunds    {ACTION($$, DISABLE,   rlist);}
-       |    REINSTATE LABEL    {TARGET($$, REINSTATE, $2);}
+       |    REINSTATE LABEL    {stbeginline=0; TARGET($$, REINSTATE, $2);}
        |    REINSTATE gerunds  {ACTION($$, ENABLE,    rlist);}
        |    WRITE_IN inlist    {ACTION($$, WRITE_IN,  $2);}
        |    READ_OUT outlist   {ACTION($$, READ_OUT,  $2);}

diff --git a/website/index.html b/website/index.html
index 7dac5ad515aa639c70ea4847272046e5eb543cc8..f757a763398cb4f4a3efef876b92cb8dc5010b0b 100644 (file)
--- a/website/index.html
+++ b/website/index.html
@@ -22,7 +22,7 @@ content="Abandon All Sanity, Ye Who Enter Here" />
 Home Page</a></td>
 <td width="30%" align="center">Up to <a
 href="/~esr/sitemap.html">Site Map</a></td>
-<td width="30%" align="right">$Date: 2002-08-01 08:13:56 $</td>
+<td width="30%" align="right">$Date: 2003-03-04 07:15:40 $</td>
 </tr>
 </table>
 
@@ -94,7 +94,7 @@ a sense of humour. Unfortunately for you, I'm not."</blockquote>
 <h2>Implementations</h2>
 
 <p>You can download the latest version of the <a
-href="http://www.tuxedo.org/~esr/intercal/intercal-0.20.tar.gz">C-INTERCAL
+href="http://www.tuxedo.org/~esr/intercal/intercal-0.22.tar.gz">C-INTERCAL
 distribution</a> here (includes the manual and sample programs).
 Requires either bison or yacc and flex or lex. Builds and runs
 nicely under any ANSI/POSIX platform, including Linux and the free
@@ -208,7 +208,7 @@ stimulating.</p>
 Home Page</a></td>
 <td width="30%" align="center">Up to <a
 href="/~esr/sitemap.html">Site Map</a></td>
-<td width="30%" align="right">$Date: 2002-08-01 08:13:56 $</td>
+<td width="30%" align="right">$Date: 2003-03-04 07:15:40 $</td>
 </tr>
 </table>