diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2006-01-07 02:32:27 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2006-01-07 02:32:27 +0000 |
| commit | e523bd15353350c3480b8a1820a0944b0fa8212e (patch) | |
| tree | 60485116f9c62c306bb753f12f9d4eb79d16aa4e /libc/string/strpbrk.c | |
| parent | 3b3434516a3415d7e0f4e1d50c553876dcb337b2 (diff) | |
| download | uClibc-alpine-e523bd15353350c3480b8a1820a0944b0fa8212e.tar.bz2 uClibc-alpine-e523bd15353350c3480b8a1820a0944b0fa8212e.tar.xz | |
Big fricking merge from trunk.
Diffstat (limited to 'libc/string/strpbrk.c')
| -rw-r--r-- | libc/string/strpbrk.c | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/libc/string/strpbrk.c b/libc/string/strpbrk.c index 88e0b4051..704b1bc71 100644 --- a/libc/string/strpbrk.c +++ b/libc/string/strpbrk.c @@ -1,14 +1,31 @@ /* + * Copyright (C) 2002 Manuel Novoa III * Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org> * * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. */ -#define L_strpbrk -#define Wstrpbrk __strpbrk +#include "_string.h" -#include "wstring.c" +#ifdef WANT_WIDE +# define __Wstrpbrk __wcspbrk +# define Wstrpbrk wcspbrk +#else +# define __Wstrpbrk __strpbrk +# define Wstrpbrk strpbrk +#endif -strong_alias(__strpbrk, strpbrk) +Wchar attribute_hidden *__Wstrpbrk(const Wchar *s1, const Wchar *s2) +{ + register const Wchar *s; + register const Wchar *p; -#undef L_strpbrk + for ( s=s1 ; *s ; s++ ) { + for ( p=s2 ; *p ; p++ ) { + if (*p == *s) return (Wchar *) s; /* silence the warning */ + } + } + return NULL; +} + +strong_alias(__Wstrpbrk,Wstrpbrk) |