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/strcpy.c | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) (limited to 'libc/string/strcpy.c') diff --git a/libc/string/strcpy.c b/libc/string/strcpy.c index 8dcdddde4..3b0e490eb 100644 --- a/libc/string/strcpy.c +++ b/libc/string/strcpy.c @@ -1,14 +1,33 @@ /* + * 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_strcpy -#define Wstrcpy __strcpy +#include "_string.h" -#include "wstring.c" +#ifdef WANT_WIDE +# define __Wstrcpy __wcscpy +# define Wstrcpy wcscpy +#else +# define __Wstrcpy __strcpy +# define Wstrcpy strcpy +#endif -strong_alias(__strcpy, strcpy) +Wchar attribute_hidden *__Wstrcpy(Wchar * __restrict s1, const Wchar * __restrict s2) +{ + register Wchar *s = s1; -#undef L_strcpy +#ifdef __BCC__ + do { + *s = *s2++; + } while (*s++ != 0); +#else + while ( (*s++ = *s2++) != 0 ); +#endif + + return s1; +} + +strong_alias(__Wstrcpy,Wstrcpy) -- cgit v1.2.3