diff --git a/libc/Makefile b/libc/Makefile index 791e4ec7..4672bfd1 100644 --- a/libc/Makefile +++ b/libc/Makefile @@ -83,6 +83,7 @@ integer.o \ localtime.o \ localtime_r.o \ mbtowc.o \ +memccpy.o \ memchr.o \ memcmp.o \ memcpy.o \ diff --git a/libc/include/string.h b/libc/include/string.h index f2a50c62..f6d01ba8 100644 --- a/libc/include/string.h +++ b/libc/include/string.h @@ -34,6 +34,7 @@ __BEGIN_DECLS @include(size_t.h) @include(locale_t.h) +void* memccpy(void* restrict, const void* restrict, int, size_t); void* memchr(const void*, int, size_t); int memcmp(const void*, const void*, size_t); void* memcpy(void* restrict, const void* restrict, size_t); @@ -63,7 +64,6 @@ char* strtok_r(char* restrict, const char* restrict, char** restrict); /* TODO: These are not implemented in sortix libc yet. */ #if defined(__SORTIX_SHOW_UNIMPLEMENTED) -void* memccpy(void* restrict, const void* restrict, int, size_t); int strcoll_l(const char*, const char*, locale_t); char* strerror_l(int, locale_t); int strerror_r(int, char*, size_t); diff --git a/libc/memccpy.cpp b/libc/memccpy.cpp new file mode 100644 index 00000000..fa126c54 --- /dev/null +++ b/libc/memccpy.cpp @@ -0,0 +1,39 @@ +/******************************************************************************* + + Copyright(C) Jonas 'Sortie' Termansen 2011, 2012. + + 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 . + + memccpy.cpp + Copy memory until length is met or character is encountered. + +*******************************************************************************/ + +#include +#include +#include + +extern "C" void* memccpy(void* destp, const void* srcp, int c, size_t n) +{ + uint8_t* dest = (uint8_t*) destp; + const uint8_t* src = (const uint8_t*) srcp; + for ( size_t i = 0; i < n; i++ ) + if ( src[i] == (uint8_t) c ) + return dest + i; + else + dest[i] = src[i]; + return NULL; +}