BSD 4_3_Reno release

[unix-history] / usr / src / lib / libc / string / strlen.c

diff --git a/usr/src/lib/libc/string/strlen.c b/usr/src/lib/libc/string/strlen.c
index 854b6d4..056045b 100644 (file)
--- a/usr/src/lib/libc/string/strlen.c
+++ b/usr/src/lib/libc/string/strlen.c
@@ -1,19 +1,36 @@
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that: (1) source distributions retain this entire copyright
+ * notice and comment, and (2) distributions including binaries display
+ * the following acknowledgement:  ``This product includes software
+ * developed by the University of California, Berkeley and its contributors''
+ * in the documentation or other materials provided with the distribution
+ * and in all advertising materials mentioning features or use of this
+ * software. Neither the name of the University nor the names of its
+ * contributors may 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 MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+

 #if defined(LIBC_SCCS) && !defined(lint)
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)strlen.c   5.2 (Berkeley) %G%";
-#endif LIBC_SCCS and not lint
+static char sccsid[] = "@(#)strlen.c   5.4 (Berkeley) 5/17/90";
+#endif /* LIBC_SCCS and not lint */

 
 

-/*
- * Returns the number of
- * non-NULL bytes in string argument.
- */
+#include <sys/stdc.h>
+#include <string.h>

 
 

-strlen(s)
-register char *s;
+size_t
+strlen(str)
+       const char *str;

 {
 {

-       register n;
+       register const char *s;

 
 

-       n = 0;
-       while (*s++)
-               n++;
-       return(n);
+       for (s = str; *s; ++s);
+       return(s - str);

 }
 }

+