mirrors
/
lua
mirror of https://github.com/lua/lua
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

"file:write" returns "file" in case of success

This commit is contained in:
Roberto Ierusalimschy 2009-09-01 16:10:48 -03:00
parent 4a714cebd1
commit d9fbbe1f23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
liolib.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: liolib.c,v 2.80 2009/02/20 13:50:27 roberto Exp roberto $ ** $Id: liolib.c,v 2.81 2009/08/28 13:51:57 roberto Exp roberto $
** Standard I/O (and system) library ** Standard I/O (and system) library
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -422,7 +422,7 @@ static int io_readline (lua_State *L) {
static int g_write (lua_State *L, FILE *f, int arg) { static int g_write (lua_State *L, FILE *f, int arg) {
int nargs = lua_gettop(L) - 1; int nargs = lua_gettop(L) - arg;
int status = 1; int status = 1;
for (; nargs--; arg++) { for (; nargs--; arg++) {
if (lua_type(L, arg) == LUA_TNUMBER) { if (lua_type(L, arg) == LUA_TNUMBER) {
@ -436,7 +436,8 @@ static int g_write (lua_State *L, FILE *f, int arg) {
status = status && (fwrite(s, sizeof(char), l, f) == l); status = status && (fwrite(s, sizeof(char), l, f) == l);
} }
} }
return pushresult(L, status, NULL); if (status) return 1; /* file handle already on stack top */
else return pushresult(L, status, NULL);
} }
@ -446,7 +447,9 @@ static int io_write (lua_State *L) {
static int f_write (lua_State *L) { static int f_write (lua_State *L) {
return g_write(L, tofile(L), 2); FILE * f = tofile(L);
lua_pushvalue(L, 1); /* push file at the stack top (to be returned) */
return g_write(L, f, 2);
} }