diff options
| author | Simon Glass <sjg@chromium.org> | 2017-05-18 20:09:28 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2017-06-01 07:03:12 -0600 |
| commit | 6b45ba45fbcd1acc11c88ee1c15ed5fcb49f9e32 (patch) | |
| tree | b4f0c569dbbe93e4723f2add9e26ae48a232c3fc | |
| parent | a4b8e372d5b15d7dd302cac667e87049b59b13c7 (diff) | |
| download | u-boot-6b45ba45fbcd1acc11c88ee1c15ed5fcb49f9e32.tar.gz u-boot-6b45ba45fbcd1acc11c88ee1c15ed5fcb49f9e32.tar.bz2 u-boot-6b45ba45fbcd1acc11c88ee1c15ed5fcb49f9e32.zip | |
string: Add strchrnul()
This functions works like strchr() but returns the end of the string if
the character is not found. Add an implementation of this.
Signed-off-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | include/linux/string.h | 13 | ||||
| -rw-r--r-- | lib/string.c | 8 |
2 files changed, 21 insertions, 0 deletions
diff --git a/include/linux/string.h b/include/linux/string.h index 091ccab395..718c3720a1 100644 --- a/include/linux/string.h +++ b/include/linux/string.h @@ -50,6 +50,19 @@ extern int strncasecmp(const char *s1, const char *s2, __kernel_size_t len); #ifndef __HAVE_ARCH_STRCHR extern char * strchr(const char *,int); #endif + +/** + * strchrnul() - return position of a character in the string, or end of string + * + * The strchrnul() function is like strchr() except that if c is not found + * in s, then it returns a pointer to the nul byte at the end of s, rather than + * NULL + * @s: string to search + * @c: character to search for + * @return position of @c in @s, or end of @s if not found + */ +const char *strchrnul(const char *s, int c); + #ifndef __HAVE_ARCH_STRRCHR extern char * strrchr(const char *,int); #endif diff --git a/lib/string.c b/lib/string.c index e94021c468..e6e749b80b 100644 --- a/lib/string.c +++ b/lib/string.c @@ -230,6 +230,14 @@ char * strchr(const char * s, int c) } #endif +const char *strchrnul(const char *s, int c) +{ + for (; *s != (char)c; ++s) + if (*s == '\0') + break; + return s; +} + #ifndef __HAVE_ARCH_STRRCHR /** * strrchr - Find the last occurrence of a character in a string |