Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-01 18:24:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CRT]

Browse source 
Fix handling of multibyte strings in _splitpath. Fixes 2 winetests.

svn path=/trunk/; revision=63245
This commit is contained in:
Timo Kreuzer 2014-05-11 22:25:46 +00:00
parent 109185f9de
commit 1147b7f948
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
reactos/lib/sdk/crt/string/_tsplitpath_x.h
View file

@ -7,6 +7,7 @@
#include <precomp.h>
#include <tchar.h>
#include <mbctype.h>
#if IS_SECAPI
#define _FAILURE -1
@ -99,12 +100,24 @@ _tsplitpath_x(
drive[2] = '\0';
}
path += 2;
}
}
/* Scan the rest of the string */
dir_start = path;
while (*path != '\0')
{
#ifndef _UNICODE
/* Check for multibyte lead bytes */
if (_ismbblead((unsigned char)*path))
{
/* Check for unexpected end of string */
if (path[1] == 0) break;
/* Skip the lead byte and the following byte */
path += 2;
continue;
}
#endif
/* Remember last path separator and last dot */
if ((*path == '\\') || (*path == '/')) file_start = path + 1;
if (*path == '.') ext_start = path;
@ -114,14 +127,14 @@ _tsplitpath_x(
/* Check if we got a file name / extension */
if (!file_start)
file_start = dir_start;
if (!ext_start || ext_start < file_start)
if (!ext_start || (ext_start < file_start))
ext_start = path;
if (dir)
{
src = dir_start;
count = dir_size - 1;
while (src < file_start && count--) *dir++ = *src++;
while ((src < file_start) && count--) *dir++ = *src++;
*dir = '\0';
}