From 167d5e33fcb821e51e2f9dcf460591737c3c7972 Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Tue, 3 Jan 2006 14:50:18 +0000 Subject: Complete split of all the string functions. Hope haven't broken too much. wcscoll/strcoll needs some love ... --- libc/string/strchrnul.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) (limited to 'libc/string/strchrnul.c') diff --git a/libc/string/strchrnul.c b/libc/string/strchrnul.c index 2656c2801..c498532fd 100644 --- a/libc/string/strchrnul.c +++ b/libc/string/strchrnul.c @@ -1,14 +1,25 @@ /* + * Copyright (C) 2002 Manuel Novoa III * Copyright (C) 2000-2005 Erik Andersen * * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. */ -#define L_strchrnul -#define Wstrchrnul __strchrnul +#include "_string.h" -#include "wstring.c" +#ifdef WANT_WIDE +# define __Wstrchrnul __wcschrnul +# define Wstrchrnul wcschrnul +#else +# define __Wstrchrnul __strchrnul +# define Wstrchrnul strchrnul +#endif -strong_alias(__strchrnul, strchrnul) +Wchar attribute_hidden *__Wstrchrnul(register const Wchar *s, Wint c) +{ + --s; + while (*++s && (*s != ((Wchar)c))); + return (Wchar *) s; +} -#undef L_strchrnul +strong_alias(__Wstrchrnul,Wstrchrnul) -- cgit v1.2.3