diff options
| -rw-r--r-- | commands/hwclock.c | 8 | ||||
| -rw-r--r-- | drivers/of/base.c | 5 | ||||
| -rw-r--r-- | include/linux/string.h | 4 | ||||
| -rw-r--r-- | lib/string.c | 18 |
4 files changed, 23 insertions, 12 deletions
diff --git a/commands/hwclock.c b/commands/hwclock.c index 1b5c2cd100..7a5600c456 100644 --- a/commands/hwclock.c +++ b/commands/hwclock.c @@ -9,14 +9,6 @@ #include <string.h> #include <environment.h> -static char *strchrnul(const char *s, int c) -{ - while (*s != '\0' && *s != c) - s++; - - return (char *)s; -} - static int sscanf_two_digits(char *s, int *res) { char buf[3]; diff --git a/drivers/of/base.c b/drivers/of/base.c index 9a8fdc81e8..77970bfbe9 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -2475,10 +2475,7 @@ struct device_node *of_get_stdoutpath(void) if (!name) return 0; - /* This could make use of strchrnul if it were available */ - p = strchr(name, ':'); - if (!p) - p = name + strlen(name); + p = strchrnul(name, ':'); q = xstrndup(name, p - name); diff --git a/include/linux/string.h b/include/linux/string.h index 55bc905c0e..47a27a391f 100644 --- a/include/linux/string.h +++ b/include/linux/string.h @@ -25,6 +25,10 @@ extern __kernel_size_t strspn(const char *,const char *); (typeof(&(s1)[0]))(_strstr((s1), (s2))); \ }) +#ifndef __HAVE_ARCH_STRCHRNUL +extern char * strchrnul(const char *,int); +#endif + /* * Include machine specific inline routines */ diff --git a/lib/string.c b/lib/string.c index bad186586f..9aeb1d8830 100644 --- a/lib/string.c +++ b/lib/string.c @@ -274,6 +274,24 @@ char * _strchr(const char * s, int c) #endif EXPORT_SYMBOL(_strchr); +#ifndef __HAVE_ARCH_STRCHRNUL +/** + * strchrnul - Find and return a character in a string, or end of string + * @s: The string to be searched + * @c: The character to search for + * + * Returns pointer to first occurrence of 'c' in s. If c is not found, then + * return a pointer to the null byte at the end of s. + */ +char *strchrnul(const char *s, int c) +{ + while (*s && *s != (char)c) + s++; + return (char *)s; +} +EXPORT_SYMBOL(strchrnul); +#endif + #ifndef __HAVE_ARCH_STRRCHR /** * strrchr - Find the last occurrence of a character in a string |