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
Merge branch 'master' of git://git.ucc.asn.au/tpg/acess2
[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
e9e1574
..
3d30f1c
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
*/
@@
-273,10
+285,11
@@
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)dest > (intptr_t)src && (intptr_t)dest < (intptr_t)src+count )
- for(;count--;) dp[count] = sp[count];
+ if( (uintptr_t)src < (uintptr_t)dest && (uintptr_t)dest < (uintptr_t)src+count )
+ for(;count--;)
+ dp[count] = sp[count];
else
else
-
for(;count--;) *dp++ = *sp++
;
+
memcpy(dest, src, count)
;
return dest;
}
return dest;
}
UCC
git Repository :: git.ucc.asn.au