Merge pull request #108 from Makuna/strnlen

igrr · igrr · commit eab9e873a6b6 · 2015-04-26T17:41:38.000+08:00
strnlen implementation
diff --git a/hardware/esp8266com/esp8266/cores/esp8266/libc_replacements.c b/hardware/esp8266com/esp8266/cores/esp8266/libc_replacements.c
@@ -116,6 +116,13 @@ char* strncpy(char * dest, const char * src, size_t n) {
     return ets_strncpy(dest, src, n);
 }
 
+size_t strnlen(const char *s, size_t len) {
+    // there is no ets_strnlen
+    const char *cp;
+    for (cp = s; len != 0 && *cp != '\0'; cp++, len--);
+    return (size_t)(cp - s);
+}
+
 char* strstr(const char *haystack, const char *needle) {
     return ets_strstr(haystack, needle);
 }

Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,13 @@ char* strncpy(char * dest, const char * src, size_t n) {`
`116`	`116`	`return ets_strncpy(dest, src, n);`
`117`	`117`	`}`
`118`	`118`
	`119`	`+size_t strnlen(const char *s, size_t len) {`
	`120`	`+ // there is no ets_strnlen`
	`121`	`+ const char *cp;`
	`122`	`+ for (cp = s; len != 0 && *cp != '\0'; cp++, len--);`
	`123`	`+ return (size_t)(cp - s);`
	`124`	`+}`
	`125`	`+`
`119`	`126`	`char* strstr(const char haystack, const char needle) {`
`120`	`127`	`return ets_strstr(haystack, needle);`
`121`	`128`	`}`