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/strncpy.c | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) (limited to 'libc/string/strncpy.c') diff --git a/libc/string/strncpy.c b/libc/string/strncpy.c index c96be715e..09124ac99 100644 --- a/libc/string/strncpy.c +++ b/libc/string/strncpy.c @@ -1,14 +1,39 @@ /* + * 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_strncpy -#define Wstrncpy __strncpy +#include "_string.h" -#include "wstring.c" +#ifdef WANT_WIDE +# define __Wstrncpy __wcsncpy +# define Wstrncpy wcsncpy +#else +# define __Wstrncpy __strncpy +# define Wstrncpy strncpy +#endif -strong_alias(__strncpy, strncpy) +Wchar attribute_hidden *__Wstrncpy(Wchar * __restrict s1, register const Wchar * __restrict s2, + size_t n) +{ + register Wchar *s = s1; -#undef L_strncpy +#ifdef __BCC__ + while (n--) { + if ((*s = *s2) != 0) s2++; /* Need to fill tail with 0s. */ + ++s; + } +#else + while (n) { + if ((*s = *s2) != 0) s2++; /* Need to fill tail with 0s. */ + ++s; + --n; + } +#endif + + return s1; +} + +strong_alias(__Wstrncpy,Wstrncpy) -- cgit v1.2.3