From 9039553c15c70fc7f648abf9419738cfa462aaa9 Mon Sep 17 00:00:00 2001 From: Jonas 'Sortie' Termansen Date: Mon, 16 Sep 2013 15:37:27 +0200 Subject: [PATCH] Add wmemmove(3). --- libc/Makefile | 1 + libc/include/wchar.h | 2 +- libc/wchar/wmemmove.cpp | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 libc/wchar/wmemmove.cpp diff --git a/libc/Makefile b/libc/Makefile index d898febc..e87a5978 100644 --- a/libc/Makefile +++ b/libc/Makefile @@ -202,6 +202,7 @@ wchar/wcsxfrm.o \ wchar/wmemchr.o \ wchar/wmemcmp.o \ wchar/wmemcpy.o \ +wchar/wmemmove.o \ wctype/wctype.o \ HOSTEDOBJS=\ diff --git a/libc/include/wchar.h b/libc/include/wchar.h index 96a2c147..7d384223 100644 --- a/libc/include/wchar.h +++ b/libc/include/wchar.h @@ -90,6 +90,7 @@ size_t wcsxfrm(wchar_t* __restrict, const wchar_t* __restrict, size_t); wchar_t* wmemchr(const wchar_t*, wchar_t, size_t); int wmemcmp(const wchar_t*, const wchar_t*, size_t); wchar_t* wmemcpy(wchar_t* __restrict, const wchar_t* __restrict, size_t); +wchar_t* wmemmove(wchar_t*, const wchar_t*, size_t); /* TODO: These are not implemented in sortix libc yet. */ #if defined(__SORTIX_SHOW_UNIMPLEMENTED) @@ -117,7 +118,6 @@ int wscanf(const wchar_t* __restrict, ...); long double wcstold(const wchar_t* __restrict, wchar_t** __restrict); size_t wcsftime(wchar_t* __restrict, size_t, const wchar_t* __restrict, const struct tm* __restrict); wchar_t* fgetws(wchar_t* __restrict, int, FILE* __restrict); -wchar_t* wmemmove(wchar_t*, const wchar_t*, size_t); wchar_t* wmemset(wchar_t*, wchar_t, size_t); wint_t btowc(int); wint_t fgetwc(FILE*); diff --git a/libc/wchar/wmemmove.cpp b/libc/wchar/wmemmove.cpp new file mode 100644 index 00000000..1331f71f --- /dev/null +++ b/libc/wchar/wmemmove.cpp @@ -0,0 +1,37 @@ +/******************************************************************************* + + Copyright(C) Jonas 'Sortie' Termansen 2013. + + This file is part of the Sortix C Library. + + The Sortix C Library is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation, either version 3 of the License, or (at your + option) any later version. + + The Sortix C Library is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with the Sortix C Library. If not, see . + + wchar/wmemmove.cpp + Copy wide memory between potentially overlapping regions. + +*******************************************************************************/ + +#include +#include + +extern "C" wchar_t* wmemmove(wchar_t* dst, const wchar_t* src, size_t n) +{ + if ( (uintptr_t) dst < (uintptr_t) src ) + for ( size_t i = 0; i < n; i++ ) + dst[i] = src[i]; + else + for ( size_t i = 0; i < n; i++ ) + dst[n-i] = src[n-i]; + return dst; +}