X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fstring%2Fstrcspn.c;fp=src%2Fstring%2Fstrcspn.c;h=cfdba114ca632ee86f433f7d00b744fb1fb6de19;hp=c843ff97476aedb4821fc41091689bfc8652fea2;hb=68dbd05039f8b256f586ed9a589645fa3a1b7f5f;hpb=3f9ff1514e49b06c20a61af9ae9e52bd53b48d9a

diff --git a/src/string/strcspn.c b/src/string/strcspn.c
index c843ff97..cfdba114 100644
--- a/src/string/strcspn.c
+++ b/src/string/strcspn.c
@@ -3,13 +3,14 @@
 #define BITOP(a,b,op) \
  ((a)[(size_t)(b)/(8*sizeof *(a))] op (size_t)1<<((size_t)(b)%(8*sizeof *(a))))
 
+char *__strchrnul(const char *, int);
+
 size_t strcspn(const char *s, const char *c)
 {
 	const char *a = s;
 	size_t byteset[32/sizeof(size_t)];
 
-	if (!c[0]) return strlen(s);
-	if (!c[1]) return (s=strchr(s, *c)) ? s-a : strlen(a);
+	if (!c[0] || !c[1]) return __strchrnul(s, *c)-a;
 
 	memset(byteset, 0, sizeof byteset);
 	for (; *c && BITOP(byteset, *(unsigned char *)c, |=); c++);