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/strncat.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/strncat.c')
| -rw-r--r-- | libc/string/strncat.c | 34 |
1 files changed, 29 insertions, 5 deletions
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 <andersen@uclibc.org> * * 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) |