BSD 4_3_Tahoe release

[unix-history] / usr / src / bin / csh / sh.lex.c

diff --git a/usr/src/bin/csh/sh.lex.c b/usr/src/bin/csh/sh.lex.c
index f5da907..ec11ade 100644 (file)
--- a/usr/src/bin/csh/sh.lex.c
+++ b/usr/src/bin/csh/sh.lex.c
@@ -5,7 +5,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char *sccsid = "@(#)sh.lex.c    5.4 (Berkeley) 3/29/86";
+static char *sccsid = "@(#)sh.lex.c    5.6 (Berkeley) 5/19/88";

 #endif
 
 #include "sh.h"
 #endif
 
 #include "sh.h"


@@ -111,7 +111,7 @@ prlex(sp0)
                if (sp == sp0)
                        break;
                if (sp->word[0] != '\n')
                if (sp == sp0)
                        break;
                if (sp->word[0] != '\n')

-                       putchar(' ');
+                       cshputchar(' ');

        }
 }
 
        }
 }
 


@@ -426,8 +426,8 @@ addla(cp)
 {
        char buf[BUFSIZ];
 
 {
        char buf[BUFSIZ];
 

-       if (lap != 0 && strlen(cp) + strlen(lap) >= sizeof (labuf) - 4) {
-               seterr("Expansion buf ovflo");
+       if (strlen(cp) + (lap ? strlen(lap) : 0) >= sizeof (labuf) - 4) {
+               seterr("Expansion buffer overflow");

                return;
        }
        if (lap)
                return;
        }
        if (lap)