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/IRC - Fixed bad merge
[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
..
2ab271f
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;
}
@@
-273,7
+285,7
@@
EXPORT void *memmove(void *dest, const void *src, size_t count)
char *sp = (char *)src;
char *dp = (char *)dest;
// Check if the areas overlap
char *sp = (char *)src;
char *dp = (char *)dest;
// Check if the areas overlap
- if( (
intptr_t)src < (intptr_t)dest && (intptr_t)dest < (
intptr_t)src+count )
+ if( (
uintptr_t)src < (uintptr_t)dest && (uintptr_t)dest < (u
intptr_t)src+count )
for(;count--;)
dp[count] = sp[count];
else
for(;count--;)
dp[count] = sp[count];
else
UCC
git Repository :: git.ucc.asn.au