We need strstr now...

SCCS-vsn: bin/csh/misc.c 5.17
SCCS-vsn: bin/csh/str.c 5.10
SCCS-vsn: bin/csh/extern.h 5.10

diff --git a/usr/src/bin/csh/extern.h b/usr/src/bin/csh/extern.h
index d0ee772..b8bc43a 100644 (file)
--- a/usr/src/bin/csh/extern.h
+++ b/usr/src/bin/csh/extern.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)extern.h    5.9 (Berkeley) %G%
+ *     @(#)extern.h    5.10 (Berkeley) %G%

  */
 
 #include <sys/cdefs.h>
  */
 
 #include <sys/cdefs.h>


@@ -191,10 +191,10 @@ char       *strsave __P((char *));
 char    *strspl __P((char *, char *));
 void     udvar __P((Char *));
 
 char    *strspl __P((char *, char *));
 void     udvar __P((Char *));
 

-#ifndef        NOTUSED
-char    *strstr __P((const char *, const char *));
-#endif

 #ifndef        SHORT_STRINGS
 #ifndef        SHORT_STRINGS

+# ifdef NOTUSED
+char    *strstr __P((const char *, const char *));
+# endif /* NOTUSED */

 char    *strend __P((char *));
 #endif
 
 char    *strend __P((char *));
 #endif
 


@@ -308,9 +308,7 @@ int   s_strcmp __P((Char *, Char *));
 int      s_strncmp __P((Char *, Char *, size_t));
 Char    *s_strsave __P((Char *));
 Char    *s_strend __P((Char *));
 int      s_strncmp __P((Char *, Char *, size_t));
 Char    *s_strsave __P((Char *));
 Char    *s_strend __P((Char *));

-#ifdef NOTUSED

 Char    *s_strstr __P((Char *, Char *));
 Char    *s_strstr __P((Char *, Char *));

-#endif

 Char    *str2short __P((char *));
 Char   **blk2short __P((char **));
 char    *short2str __P((Char *));
 Char    *str2short __P((char *));
 Char   **blk2short __P((char **));
 char    *short2str __P((Char *));

diff --git a/usr/src/bin/csh/misc.c b/usr/src/bin/csh/misc.c
index 37f2c0d..6617192 100644 (file)
--- a/usr/src/bin/csh/misc.c
+++ b/usr/src/bin/csh/misc.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)misc.c     5.16 (Berkeley) %G%";
+static char sccsid[] = "@(#)misc.c     5.17 (Berkeley) %G%";

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

diff --git a/usr/src/bin/csh/str.c b/usr/src/bin/csh/str.c
index 80ee66f..2498d7b 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.9 (Berkeley) %G%";
+static char sccsid[] = "@(#)str.c      5.10 (Berkeley) %G%";

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


@@ -347,7 +347,6 @@ s_strend(cp)
     return (cp);
 }
 
     return (cp);
 }
 

-# ifdef NOTUSED

 Char   *
 s_strstr(s, t)
     register Char *s, *t;
 Char   *
 s_strstr(s, t)
     register Char *s, *t;


@@ -363,7 +362,6 @@ s_strstr(s, t)
     } while (*s++ != '\0');
     return (NULL);
 }
     } while (*s++ != '\0');
     return (NULL);
 }

-# endif

 #endif                         /* SHORT_STRINGS */
 
 char   *
 #endif                         /* SHORT_STRINGS */
 
 char   *