git://git.jankratochvil.net
/
reactos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update for HEAD-2003021201
[reactos.git]
/
lib
/
msvcrt
/
mbstring
/
mbsncpy.c
diff --git
a/lib/msvcrt/mbstring/mbsncpy.c
b/lib/msvcrt/mbstring/mbsncpy.c
index
a2e21c0
..
96d600f
100644
(file)
--- a/
lib/msvcrt/mbstring/mbsncpy.c
+++ b/
lib/msvcrt/mbstring/mbsncpy.c
@@
-1,7
+1,7
@@
/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries
/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries
- * FILE: lib/
crtdll
/mbstring/mbsncpy.c
+ * FILE: lib/
msvcrt
/mbstring/mbsncpy.c
* PURPOSE: Copies a string to a maximum of n bytes or characters
* PROGRAMER: Boudewijn Dekker
* UPDATE HISTORY:
* PURPOSE: Copies a string to a maximum of n bytes or characters
* PROGRAMER: Boudewijn Dekker
* UPDATE HISTORY:
@@
-10,7
+10,8
@@
#include <msvcrt/mbstring.h>
#include <msvcrt/mbstring.h>
-unsigned char *_mbsncpy(unsigned char *str1, const unsigned char *str2, size_t n)
+
+unsigned char* _mbsncpy(unsigned char *str1, const unsigned char *str2, size_t n)
{
unsigned char *s1 = (unsigned char *)str1;
unsigned char *s2 = (unsigned char *)str2;
{
unsigned char *s1 = (unsigned char *)str1;
unsigned char *s2 = (unsigned char *)str2;
@@
-43,6
+44,13
@@
unsigned char *_mbsncpy(unsigned char *str1, const unsigned char *str2, size_t n
return str1;
}
return str1;
}
+
+//
+//The _mbsnbcpy function copies count bytes from src to dest. If src is shorter
+//than dest, the string is padded with null characters. If dest is less than or
+//equal to count it is not terminated with a null character.
+//
+
unsigned char * _mbsnbcpy(unsigned char *str1, const unsigned char *str2, size_t n)
{
unsigned char *s1 = (unsigned char *)str1;
unsigned char * _mbsnbcpy(unsigned char *str1, const unsigned char *str2, size_t n)
{
unsigned char *s1 = (unsigned char *)str1;
@@
-54,8
+62,10
@@
unsigned char * _mbsnbcpy(unsigned char *str1, const unsigned char *str2, size_t
return 0;
do {
return 0;
do {
- if (*s2 == 0)
+ if (*s2 == 0) {
+ *s1 = *s2;
break;
break;
+ }
if ( !_ismbblead(*s2) ) {
if ( !_ismbblead(*s2) ) {