commit 7ea180af6eea4d3ab0a9afe03836e53e0b3e5cde
parent 05d567d52e9155327b73fab14d7d635726943d94
Author: Roberto Ierusalimschy <roberto@inf.puc-rio.br>
Date: Fri, 14 Mar 2003 16:07:49 -0300
detail
Diffstat:
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/liolib.c b/liolib.c
@@ -1,5 +1,5 @@
/*
-** $Id: liolib.c,v 2.35 2003/03/11 12:24:34 roberto Exp roberto $
+** $Id: liolib.c,v 2.36 2003/03/14 19:00:16 roberto Exp roberto $
** Standard I/O (and system) library
** See Copyright Notice in lua.h
*/
@@ -231,13 +231,9 @@ static FILE *getiofile (lua_State *L, const char *name) {
static int g_iofile (lua_State *L, const char *name, const char *mode) {
- if (lua_isnoneornil(L, 1)) {
- lua_pushstring(L, name);
- lua_rawget(L, lua_upvalueindex(1));
- return 1;
- }
- else {
+ if (!lua_isnoneornil(L, 1)) {
const char *filename = lua_tostring(L, 1);
+ lua_pushstring(L, name);
if (filename) {
FILE **pf = newfile(L);
*pf = fopen(filename, mode);
@@ -250,11 +246,12 @@ static int g_iofile (lua_State *L, const char *name, const char *mode) {
tofile(L, 1); /* check that it's a valid file handle */
lua_pushvalue(L, 1);
}
- lua_pushstring(L, name);
- lua_pushvalue(L, -2);
lua_rawset(L, lua_upvalueindex(1));
- return 1;
}
+ /* return current value */
+ lua_pushstring(L, name);
+ lua_rawget(L, lua_upvalueindex(1));
+ return 1;
}