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/strncmp.c | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) (limited to 'libc/string/strncmp.c') diff --git a/libc/string/strncmp.c b/libc/string/strncmp.c index d36003ab6..ad80ce8e5 100644 --- a/libc/string/strncmp.c +++ b/libc/string/strncmp.c @@ -1,14 +1,42 @@ /* + * 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_strncmp -#define Wstrncmp __strncmp +#include "_string.h" -#include "wstring.c" +#ifdef WANT_WIDE +# define __Wstrncmp __wcsncmp +# define Wstrncmp wcsncmp +#else +# define __Wstrncmp __strncmp +# define Wstrncmp strncmp +#endif -strong_alias(__strncmp, strncmp) +int attribute_hidden __Wstrncmp(register const Wchar *s1, register const Wchar *s2, size_t n) +{ +#ifdef WANT_WIDE + while (n && (*((Wuchar *)s1) == *((Wuchar *)s2))) { + if (!*s1++) { + return 0; + } + ++s2; + --n; + } -#undef L_strncmp + return (n == 0) ? 0 : ((*((Wuchar *)s1) < *((Wuchar *)s2)) ? -1 : 1); +#else + int r = 0; + + while (n-- + && ((r = ((int)(*((unsigned char *)s1))) - *((unsigned char *)s2++)) + == 0) + && *s1++); + + return r; +#endif +} + +strong_alias(__Wstrncmp,Wstrncmp) -- cgit v1.2.3