BSD 4_3_Tahoe release

[unix-history] / usr / src / lib / libc / gen / index.c

diff --git a/usr/src/lib/libc/gen/index.c b/usr/src/lib/libc/gen/index.c
index 6a6871c..e2b5bd6 100644 (file)
--- a/usr/src/lib/libc/gen/index.c
+++ b/usr/src/lib/libc/gen/index.c
@@ -1,21 +1,35 @@
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)index.c    5.2 (Berkeley) 3/9/86";
-#endif LIBC_SCCS and not lint
-

 /*
 /*

- * Return the ptr in sp at which the character c appears;
- * NULL if not found
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.

  */
 
  */
 

-#define        NULL    0
+#if defined(LIBC_SCCS) && !defined(lint)
+static char sccsid[] = "@(#)index.c    5.4 (Berkeley) 6/27/88";
+#endif /* LIBC_SCCS and not lint */
+
+#include <stdio.h>

 
 char *
 
 char *

-index(sp, c)
-register char *sp, c;
+index(p, ch)
+       register char *p, ch;

 {
 {

-       do {
-               if (*sp == c)
-                       return(sp);
-       } while (*sp++);
-       return(NULL);
+       for (;; ++p) {
+               if (*p == ch)
+                       return(p);
+               if (!*p)
+                       return((char *)NULL);
+       }
+       /* NOTREACHED */

 }
 }