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/strncat.c | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) (limited to 'libc/string/strncat.c') diff --git a/libc/string/strncat.c b/libc/string/strncat.c index 623354305..20fbcfa27 100644 --- a/libc/string/strncat.c +++ b/libc/string/strncat.c @@ -1,14 +1,38 @@ /* + * 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_strncat -#define Wstrncat __strncat +#include "_string.h" -#include "wstring.c" +#ifdef WANT_WIDE +# define __Wstrncat __wcsncat +# define Wstrncat wcsncat +#else +# define __Wstrncat __strncat +# define Wstrncat strncat +#endif -strong_alias(__strncat, strncat) +Wchar attribute_hidden *__Wstrncat(Wchar * __restrict s1, register const Wchar * __restrict s2, + size_t n) +{ + register Wchar *s = s1; -#undef L_strncat + while (*s++); + --s; +#if __BCC__ + while (n-- && ((*s = *s2++) != 0)) ++s; +#else + while (n && ((*s = *s2++) != 0)) { + --n; + ++s; + } +#endif + *s = 0; + + return s1; +} + +strong_alias(__Wstrncat,Wstrncat) -- cgit v1.2.3