Fixes #3003: Lua io.write() did not support numbers

This commit is contained in:
Damjan Adamic
2015-10-27 23:59:18 +01:00
parent d3e2a00cd2
commit 2e068044c6
+4 -6
View File
@@ -19,6 +19,7 @@
#include <errno.h> #include <errno.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <stdio.h>
#define liolib_c #define liolib_c
@@ -183,14 +184,10 @@ static LStream *newprefile (lua_State *L) {
#if !defined(USE_FATFS) #if !defined(USE_FATFS)
static int aux_close (lua_State *L) { static int aux_close (lua_State *L) {
#if !defined(USE_FATFS)
LStream *p = tolstream(L); LStream *p = tolstream(L);
lua_CFunction cf = p->closef; lua_CFunction cf = p->closef;
p->closef = NULL; /* mark stream as closed */ p->closef = NULL; /* mark stream as closed */
return (*cf)(L); /* close it */ return (*cf)(L); /* close it */
#else
return 0;
#endif
} }
#endif #endif
@@ -559,8 +556,9 @@ static int g_write (lua_State *L, FILE *f, int arg) {
for (; nargs--; arg++) { for (; nargs--; arg++) {
if (lua_type(L, arg) == LUA_TNUMBER) { if (lua_type(L, arg) == LUA_TNUMBER) {
/* optimization: could be done exactly as for strings */ /* optimization: could be done exactly as for strings */
status = status && char s[LUAI_MAXNUMBER2STR];
f_printf(f, LUA_NUMBER_FMT, lua_tonumber(L, arg)) > 0; sprintf(s, LUA_NUMBER_FMT, lua_tonumber(L, arg));
status = status && f_puts(s, f) > 0;
} }
else { else {
size_t l; size_t l;