no short strings bug fix

SCCS-vsn: bin/csh/set.c 5.14
SCCS-vsn: bin/csh/str.c 5.8

diff --git a/usr/src/bin/csh/set.c b/usr/src/bin/csh/set.c
index 5093c05..152d0e6 100644 (file)
--- a/usr/src/bin/csh/set.c
+++ b/usr/src/bin/csh/set.c
@@ -6,11 +6,14 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)set.c      5.13 (Berkeley) %G%";
+static char sccsid[] = "@(#)set.c      5.14 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/types.h>
 #include <stdlib.h>
 #endif /* not lint */
 
 #include <sys/types.h>
 #include <stdlib.h>

+#ifndef SHORT_STRINGS
+#include <string.h>
+#endif /* SHORT_STRINGS */

 #if __STDC__
 # include <stdarg.h>
 #else
 #if __STDC__
 # include <stdarg.h>
 #else

diff --git a/usr/src/bin/csh/str.c b/usr/src/bin/csh/str.c
index 0db97c8..46e8e8d 100644 (file)
--- a/usr/src/bin/csh/str.c
+++ b/usr/src/bin/csh/str.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)str.c      5.7 (Berkeley) %G%";
+static char sccsid[] = "@(#)str.c      5.8 (Berkeley) %G%";

 #endif /* not lint */
 
 #define MALLOC_INCR    128
 #endif /* not lint */
 
 #define MALLOC_INCR    128


@@ -15,7 +15,6 @@ static char sccsid[] = "@(#)str.c     5.7 (Berkeley) %G%";
  * tc.str.c: Short string package
  *          This has been a lesson of how to write buggy code!
  */
  * tc.str.c: Short string package
  *          This has been a lesson of how to write buggy code!
  */

-#ifdef SHORT_STRINGS

 
 #if __STDC__
 # include <stdarg.h>
 
 #if __STDC__
 # include <stdarg.h>


@@ -26,6 +25,8 @@ static char sccsid[] = "@(#)str.c     5.7 (Berkeley) %G%";
 #include "csh.h"
 #include "extern.h"
 
 #include "csh.h"
 #include "extern.h"
 

+#ifdef SHORT_STRINGS
+

 Char  **
 blk2short(src)
     register char **src;
 Char  **
 blk2short(src)
     register char **src;