summaryrefslogtreecommitdiff
path: root/missing/strchr.c
diff options
context:
space:
mode:
Diffstat (limited to 'missing/strchr.c')
-rw-r--r--missing/strchr.c57
1 files changed, 21 insertions, 36 deletions
diff --git a/missing/strchr.c b/missing/strchr.c
index 50714c9..82f3cc9 100644
--- a/missing/strchr.c
+++ b/missing/strchr.c
@@ -1,45 +1,30 @@
-/*
- * strchr --- search a string for a character
- *
- * We supply this routine for those systems that aren't standard yet.
- */
-
-#include <stdio.h>
+/* public domain rewrite of strchr(3) and strrchr(3) */
char *
-strchr(str, c)
-register const char *str, c;
+strchr(s, c)
+ char *s;
+ int c;
{
- if (c == '\0') {
- /* thanks to Mike Brennan ... */
- do {
- if (*str == c)
- return (char *) str;
- } while (*str++);
- } else {
- for (; *str; str++)
- if (*str == c)
- return (char *) str;
- }
-
- return NULL;
+ if (c == 0) return s + strlen(s);
+ while (*s) {
+ if (*s == c)
+ return s;
+ s++;
+ }
+ return 0;
}
-/*
- * strrchr --- find the last occurrence of a character in a string
- *
- * We supply this routine for those systems that aren't standard yet.
- */
-
char *
-strrchr(str, c)
-register const char *str, c;
+strrchr(s, c)
+ char *s;
+ int c;
{
- register const char *save = NULL;
-
- for (; *str; str++)
- if (*str == c)
- save = str;
+ char *save = 0;
- return (char *) save;
+ while (*s) {
+ if (*s == c)
+ save = s;
+ s++;
+ }
+ return save;
}