From e523bd15353350c3480b8a1820a0944b0fa8212e Mon Sep 17 00:00:00 2001 From: "\"Steven J. Hill\"" Date: Sat, 7 Jan 2006 02:32:27 +0000 Subject: Big fricking merge from trunk. --- libc/string/stpcpy.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) (limited to 'libc/string/stpcpy.c') diff --git a/libc/string/stpcpy.c b/libc/string/stpcpy.c index c7baf5b9d..540d04831 100644 --- a/libc/string/stpcpy.c +++ b/libc/string/stpcpy.c @@ -1,14 +1,31 @@ /* + * 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_stpcpy -#define Wstpcpy __stpcpy +#include "_string.h" -#include "wstring.c" +#ifdef WANT_WIDE +# define __Wstpcpy __wcpcpy +# define Wstpcpy wcpcpy +#else +# define __Wstpcpy __stpcpy +# define Wstpcpy stpcpy +#endif -strong_alias(__stpcpy, stpcpy) +Wchar attribute_hidden *__Wstpcpy(register Wchar * __restrict s1, const Wchar * __restrict s2) +{ +#ifdef __BCC__ + do { + *s1 = *s2++; + } while (*s1++ != 0); +#else + while ( (*s1++ = *s2++) != 0 ); +#endif -#undef L_stpcpy + return s1 - 1; +} + +strong_alias(__Wstpcpy,Wstpcpy) -- cgit v1.2.3