Reuh/ctruLua
1
0
Fork 0
mirror of https://github.com/ctruLua/ctruLua.git synced 2025-10-27 16:39:29 +00:00
Code Releases Activity

Ignore the sdmc: prefix in fs.list; added missing space on some strings for the null-termination

Browse source
This commit is contained in:
Reuh 2015-10-25 12:03:21 +01:00
parent 0efdc23576
commit d015918d22
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
source/font.c
View file

@ -91,7 +91,7 @@ static int font_object_width(lua_State *L) {
int size = luaL_optinteger(L, 3, 9);
// Wide caracters support. (wchar = UTF32 on 3DS.)
wchar_t wtext[len];
wchar_t wtext[len+1];
len = mbstowcs(wtext, text, len);
*(wtext+len) = 0x0; // text end

4
source/fs.c
View file

@ -20,6 +20,8 @@ void load_lzlib(lua_State *L);
static int fs_list(lua_State *L) {
const char *path = luaL_checkstring(L, 1);
if (strncmp(path, "sdmc:", 5) == 0) path += 5; // Ignore sdmc: prefix
lua_newtable(L);
int i = 1; // table index
@ -36,7 +38,7 @@ static int fs_list(lua_State *L) {
if (!entriesRead) break;
uint8_t name[256]; // utf8 file name
uint8_t name[0x106+1]; // utf8 file name
size_t size = utf16_to_utf8(name, buffer.name, 0x106);
*(name+size) = 0x0; // mark text end

4
source/gfx.c
View file

@ -276,7 +276,7 @@ static int gfx_text(lua_State *L) {
if (font->font == NULL) luaL_error(L, "The font object was unloaded");
// Wide caracters support. (wchar = UTF32 on 3DS.)
wchar_t wtext[len];
wchar_t wtext[len+1];
len = mbstowcs(wtext, text, len);
*(wtext+len) = 0x0; // text end
@ -316,7 +316,7 @@ static int gfx_wrappedText(lua_State *L) {
// Wide caracters support. (wchar = UTF32 on 3DS.)
// Disabled as sftd_draw_wtext_wrap() doesn't exist.
/*wchar_t wtext[len];
/*wchar_t wtext[len+1];
len = mbstowcs(wtext, text, len);
*(wtext+len) = 0x0; // text end */