nortti
/
sortix-mirror
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix memccpy(3) being terribly broken.

This commit is contained in:
Jonas 'Sortie' Termansen 2014-06-21 01:38:09 +02:00
parent 874baffd57
commit 1830ab64ee
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libc/string/memccpy.cpp
View File

@ -1,6 +1,6 @@
/*******************************************************************************
Copyright(C) Jonas 'Sortie' Termansen 2011, 2012.
Copyright(C) Jonas 'Sortie' Termansen 2011, 2012, 2014.
This file is part of the Sortix C Library.
@ -23,17 +23,16 @@
*******************************************************************************/
#include <stddef.h>
#include <stdint.h>
#include <string.h>
extern "C" void* memccpy(void* destp, const void* srcp, int c, size_t n)
extern "C" void* memccpy(void* dest_ptr, const void* src_ptr, int c, size_t n)
{
uint8_t* dest = (uint8_t*) destp;
const uint8_t* src = (const uint8_t*) srcp;
unsigned char* dest = (unsigned char*) dest_ptr;
const unsigned char* src = (const unsigned char*) src_ptr;
for ( size_t i = 0; i < n; i++ )
if ( src[i] == (uint8_t) c )
return dest + i;
else
dest[i] = src[i];
{
if ( (dest[i] = src[i]) == (unsigned char) c )
return dest + i + 1;
}
return NULL;
}