X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=include%2Flinux%2Fstring.h;h=e4c7558603167bfffd23cc6966c0d88cb7b45b04;hb=363e065c02b1273364d5356711a83e7f548fc0c8;hp=369be3264a55a94578114f51d0785ca3d49559e8;hpb=77501f3cb648e18733509a951ed31eddd7ef2c0b;p=linux-2.6-omap-h63xx.git diff --git a/include/linux/string.h b/include/linux/string.h index 369be3264a5..e4c75586031 100644 --- a/include/linux/string.h +++ b/include/linux/string.h @@ -13,10 +13,7 @@ extern "C" { #endif -extern char * strpbrk(const char *,const char *); -extern char * strsep(char **,const char *); -extern __kernel_size_t strspn(const char *,const char *); -extern __kernel_size_t strcspn(const char *,const char *); +extern char *strndup_user(const char __user *, long); /* * Include machine specific inline routines @@ -59,6 +56,7 @@ extern char * strnchr(const char *, size_t, int); #ifndef __HAVE_ARCH_STRRCHR extern char * strrchr(const char *,int); #endif +extern char * strstrip(char *); #ifndef __HAVE_ARCH_STRSTR extern char * strstr(const char *,const char *); #endif @@ -68,6 +66,18 @@ extern __kernel_size_t strlen(const char *); #ifndef __HAVE_ARCH_STRNLEN extern __kernel_size_t strnlen(const char *,__kernel_size_t); #endif +#ifndef __HAVE_ARCH_STRPBRK +extern char * strpbrk(const char *,const char *); +#endif +#ifndef __HAVE_ARCH_STRSEP +extern char * strsep(char **,const char *); +#endif +#ifndef __HAVE_ARCH_STRSPN +extern __kernel_size_t strspn(const char *,const char *); +#endif +#ifndef __HAVE_ARCH_STRCSPN +extern __kernel_size_t strcspn(const char *,const char *); +#endif #ifndef __HAVE_ARCH_MEMSET extern void * memset(void *,int,__kernel_size_t);