uefi-ref/nasm
1
0
Fork 0
mirror of https://github.com/netwide-assembler/nasm synced 2026-08-26 16:23:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Windows: use MultiByteToWideChar() instead of mbsrtowcs()

Browse source 
In the Windows-specific filename translation code, use
MultiByteToWideChar() instead of mbsrtowcs(). As this is
Windows-specific code it makes more sense to use the Windows-specific
API, and it might be more widely supported?

Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
This commit is contained in:
H. Peter Anvin (Intel) 2025-12-14 17:18:59 -08:00
parent b8c2a63286
commit 5dfcfc8cab
1 changed files with 6 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

23
nasmlib/file.c
View file

@ -81,34 +81,23 @@ void fwritezero(off_t bytes, FILE *fp)
* let the Windows kernel know that we are not limited to PATH_MAX
* characters, but it breaks relative paths among other things, and
* apparently Windows 10 contains a registry option to override this
* limit anyway. One day maybe they will even implement UTF-8 as byte
* characters so we can use the standard file API even on this OS.
* limit anyway... but only for the wide character interfaces.
*/
os_filename os_mangle_filename(const char *filename)
{
mbstate_t ps;
size_t wclen;
wchar_t *buf;
const char *p;
/*
* Note: mbsrtowcs() return (size_t)-1 on error, otherwise
* the length of the string *without* final NUL in wchar_t
* units. Thus we add 1 for the final NUL; the error value
* now becomes 0.
*/
memset(&ps, 0, sizeof ps); /* Begin in the initial state */
p = filename;
wclen = mbsrtowcs(NULL, &p, 0, &ps) + 1;
wclen = MultiByteToWideChar(CP_ACP, MB_ERR_INVALID_CHARS, -1, NULL, 0);
if (!wclen)
return NULL;
buf = nasm_malloc(wclen * sizeof(wchar_t));
/* wclen is in "characters" (UTF-16 code points) */
buf = nasm_malloc(wclen << 1);
memset(&ps, 0, sizeof ps); /* Begin in the initial state */
p = filename;
if (mbsrtowcs(buf, &p, wclen, &ps) + 1 != wclen || p) {
wclen = MultiByteToWideChar(CP_ACP, MB_ERR_INVALID_CHARS, -1, buf, wclen);
if (!wclen) {
nasm_free(buf);
return NULL;
}