mirrors/lua
1
0
Fork 0
mirror of https://github.com/lua/lua synced 2024-12-29 13:49:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

better checking for read errors (with `ferror´)

Browse Source
This commit is contained in:
Roberto Ierusalimschy 2004-08-13 16:52:13 -03:00
parent ff4f8fe59a
commit 2d8b099274
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
liolib.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: liolib.c,v 2.55 2004/07/09 16:01:38 roberto Exp roberto $ ** $Id: liolib.c,v 2.56 2004/08/09 14:35:59 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
*/ */
@ -96,7 +96,7 @@ static int aux_close (lua_State *L) {
if (f == stdin || f == stdout || f == stderr) if (f == stdin || f == stdout || f == stderr)
return 0; /* file cannot be closed */ return 0; /* file cannot be closed */
else { else {
int ok = (pclose(f) != -1) || (fclose(f) == 0); int ok = (fclose(f) == 0);
if (ok) if (ok)
*(FILE **)lua_touserdata(L, 1) = NULL; /* mark file as closed */ *(FILE **)lua_touserdata(L, 1) = NULL; /* mark file as closed */
return ok; return ok;
@ -293,6 +293,7 @@ static int g_read (lua_State *L, FILE *f, int first) {
int nargs = lua_gettop(L) - 1; int nargs = lua_gettop(L) - 1;
int success; int success;
int n; int n;
clearerr(f);
if (nargs == 0) { /* no arguments? */ if (nargs == 0) { /* no arguments? */
success = read_line(L, f); success = read_line(L, f);
n = first+1; /* to return 1 result */ n = first+1; /* to return 1 result */
@ -327,6 +328,8 @@ static int g_read (lua_State *L, FILE *f, int first) {
} }
} }
} }
if (ferror(f))
return pushresult(L, 0, NULL);
if (!success) { if (!success) {
lua_pop(L, 1); /* remove last result */ lua_pop(L, 1); /* remove last result */
lua_pushnil(L); /* push nil instead */ lua_pushnil(L); /* push nil instead */
@ -347,9 +350,13 @@ static int f_read (lua_State *L) {
static int io_readline (lua_State *L) { static int io_readline (lua_State *L) {
FILE *f = *(FILE **)lua_touserdata(L, lua_upvalueindex(2)); FILE *f = *(FILE **)lua_touserdata(L, lua_upvalueindex(2));
int sucess;
if (f == NULL) /* file is already closed? */ if (f == NULL) /* file is already closed? */
luaL_error(L, "file is already closed"); luaL_error(L, "file is already closed");
if (read_line(L, f)) return 1; sucess = read_line(L, f);
if (ferror(f))
luaL_error(L, "%s", strerror(errno));
if (sucess) return 1;
else { /* EOF */ else { /* EOF */
if (lua_toboolean(L, lua_upvalueindex(3))) { /* generator created file? */ if (lua_toboolean(L, lua_upvalueindex(3))) { /* generator created file? */
lua_settop(L, 0); lua_settop(L, 0);