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/strnlen.c | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) (limited to 'libc/string/strnlen.c') diff --git a/libc/string/strnlen.c b/libc/string/strnlen.c index a480e29d1..6732cc532 100644 --- a/libc/string/strnlen.c +++ b/libc/string/strnlen.c @@ -1,14 +1,37 @@ /* + * 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_strnlen -#define Wstrnlen __strnlen +#include "_string.h" -#include "wstring.c" +#ifdef WANT_WIDE +# define __Wstrnlen __wcsnlen +# define Wstrnlen wcsnlen +#else +# define __Wstrnlen __strnlen +# define Wstrnlen strnlen +#endif -strong_alias(__strnlen, strnlen) +size_t attribute_hidden __Wstrnlen(const Wchar *s, size_t max) +{ + register const Wchar *p = s; +#ifdef __BCC__ + /* bcc can optimize the counter if it thinks it is a pointer... */ + register const char *maxp = (const char *) max; +#else +# define maxp max +#endif -#undef L_strnlen + while (maxp && *p) { + ++p; + --maxp; + } + + return p - s; +} +#undef maxp + +strong_alias(__Wstrnlen,Wstrnlen) -- cgit v1.2.3