Thayne Harbaugh:
- memchr() needs to increment pointer or it's just a busy loop (unless c
matches the first character in s)
- add memrchr.c
hpa:
Add memrchr() to <string.h>
diff --git a/include/string.h b/include/string.h
index 3bbb217..5608a3c 100644
--- a/include/string.h
+++ b/include/string.h
@@ -10,6 +10,7 @@
__extern void *memccpy(void *, const void *, int, size_t);
__extern void *memchr(const void *, int, size_t);
+__extern void *memrchr(const void *, int, size_t);
__extern int memcmp(const void *, const void *, size_t);
__extern void *memcpy(void *, const void *, size_t);
__extern void *memmove(void *, const void *, size_t);
@@ -20,6 +21,7 @@
__extern int strncasecmp(const char *, const char *, size_t);
__extern char *strcat(char *, const char *);
__extern char *strchr(const char *, int);
+__extern char *strrchr(const char *, int);
__extern int strcmp(const char *, const char *);
__extern char *strcpy(char *, const char *);
__extern size_t strcspn(const char *, const char *);
@@ -34,7 +36,6 @@
__extern char *strncpy(char *, const char *, size_t);
__extern size_t strlcpy(char *, const char *, size_t);
__extern char *strpbrk(const char *, const char *);
-__extern char *strrchr(const char *, int);
__extern char *strsep(char **, const char *);
__extern size_t strspn(const char *, const char *);
__extern char *strstr(const char *, const char *);
diff --git a/klibc/Makefile b/klibc/Makefile
index 0d44ce5..d01b2e4 100644
--- a/klibc/Makefile
+++ b/klibc/Makefile
@@ -30,7 +30,7 @@
sigaction.o sigpending.o sigprocmask.o sigsuspend.o \
brk.o sbrk.o malloc.o realloc.o calloc.o mmap.o \
memcpy.o memcmp.o memset.o memccpy.o memmem.o memswap.o \
- memmove.o memchr.o \
+ memmove.o memchr.o memrchr.o \
strcasecmp.o strncasecmp.o strndup.o strerror.o \
strcat.o strchr.o strcmp.o strcpy.o strdup.o strlen.o strnlen.o \
strncat.o strlcpy.o strlcat.o \
diff --git a/klibc/memchr.c b/klibc/memchr.c
index c5c5fa2..2e5e4cc 100644
--- a/klibc/memchr.c
+++ b/klibc/memchr.c
@@ -12,6 +12,7 @@
while ( n-- ) {
if ( *sp == (unsigned char)c )
return (void *)sp;
+ sp++;
}
return NULL;
diff --git a/klibc/memrchr.c b/klibc/memrchr.c
new file mode 100644
index 0000000..c612fa6
--- /dev/null
+++ b/klibc/memrchr.c
@@ -0,0 +1,19 @@
+/*
+ * memrchr.c
+ */
+
+#include <stddef.h>
+#include <string.h>
+
+void *memrchr(const void *s, int c, size_t n)
+{
+ const unsigned char *sp = s + n - 1;
+
+ while ( n-- ) {
+ if ( *sp == (unsigned char)c )
+ return (void *)sp;
+ sp--;
+ }
+
+ return NULL;
+}
