* configure.ac: checking whether strchr() is 8 bit clean or not.

[lha/lha.git] / src / util.c

diff --git a/src/util.c b/src/util.c
index 1dfd30d..525c485 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -390,13 +390,13 @@ xsnprintf(char *dest, size_t size, char *fmt, ...)
 }
 
 #if !STRCHR_8BIT_CLEAN
-/* 8 bit clean strchr()/strrchr() */
+/* 8 bit clean strchr()/strrchr()/memchr()/memrchr() */
 char *
 xstrchr(const char *s, int c)
 {
     while (*s) {
         if ((unsigned char)*s == (unsigned char)c)
-            return s;
+            return (char*)s;
         s++;
     }
 
@@ -410,12 +410,42 @@ xstrrchr(const char *s, int c)
 
     while (*s) {
         if ((unsigned char)*s == (unsigned char)c)
-            p = s;
+            p = (char*)s;
         s++;
     }
 
     return p;
 }
+
+char *
+xmemchr(const char *s, int c, size_t n)
+{
+    char *end = (char*)s + n;
+
+    while (s != end) {
+        if ((unsigned char)*s == (unsigned char)c)
+            return (char*)s;
+        s++;
+    }
+
+    return 0;
+}
+
+char *
+xmemrchr(const char *s, int c, size_t n)
+{
+    char *end = (char*)s-1;
+    char *p = 0;
+
+    s += n-1;
+    while (s != end) {
+        if ((unsigned char)*s == (unsigned char)c)
+            p = (char*)s;
+        s--;
+    }
+
+    return p;
+}
 #endif
 
 /* Local Variables: */