git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Usermode/libc - Fixed no definition for uid_t/pid_t in signal.h
[tpg/acess2.git]
/
Usermode
/
Libraries
/
libc.so_src
/
string.c
diff --git
a/Usermode/Libraries/libc.so_src/string.c
b/Usermode/Libraries/libc.so_src/string.c
index
3cadee9
..
6ee6d6c
100644
(file)
--- a/
Usermode/Libraries/libc.so_src/string.c
+++ b/
Usermode/Libraries/libc.so_src/string.c
@@
-100,6
+100,18
@@
EXPORT char *strcat(char *dst, const char *src)
return dst;
}
return dst;
}
+EXPORT char *strncat(char *dst, const char *src, size_t n)
+{
+ char *to = dst;
+ // Find the end
+ while(*to) to++;
+ // Copy
+ while(*src && n--) *to++ = *src++;
+ // End string
+ *to = '\0';
+ return dst;
+}
+
/**
* \brief Get the length of a string
*/
/**
* \brief Get the length of a string
*/
@@
-188,13
+200,13
@@
EXPORT char *strrchr(const char *str, int character)
* \fn EXPORT char *strstr(char *str1, const char *str2)
* \brief Search a \a str1 for the first occurance of \a str2
*/
* \fn EXPORT char *strstr(char *str1, const char *str2)
* \brief Search a \a str1 for the first occurance of \a str2
*/
-EXPORT char *strstr(char *str1, const char *str2)
+EXPORT char *strstr(c
onst c
har *str1, const char *str2)
{
const char *test = str2;
for(;*str1;str1++)
{
{
const char *test = str2;
for(;*str1;str1++)
{
- if(*test == '\0') return str1;
+ if(*test == '\0') return
(char*)
str1;
if(*str1 == *test) test++;
else test = str2;
}
if(*str1 == *test) test++;
else test = str2;
}
@@
-270,14
+282,23
@@
EXPORT void *memcpy(void *__dest, const void *__src, size_t count)
*/
EXPORT void *memmove(void *dest, const void *src, size_t count)
{
*/
EXPORT void *memmove(void *dest, const void *src, size_t count)
{
- c
har *sp = (
char *)src;
+ c
onst char *sp = (const
char *)src;
char *dp = (char *)dest;
// Check if the areas overlap
char *dp = (char *)dest;
// Check if the areas overlap
- if( (intptr_t)src < (intptr_t)dest && (intptr_t)dest < (intptr_t)src+count )
- for(;count--;)
- dp[count] = sp[count];
- else
+ if( sp >= dp+count )
+ memcpy(dest, src, count);
+ else if( dp >= sp+count )
memcpy(dest, src, count);
memcpy(dest, src, count);
+ else {
+ if( sp < dp ) {
+ while(count--)
+ dp[count] = sp[count];
+ }
+ else {
+ while(count--)
+ *dp++ = *sp++;
+ }
+ }
return dest;
}
return dest;
}
UCC
git Repository :: git.ucc.asn.au