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