diff options
author | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2013-03-21 10:57:27 -0300 |
---|---|---|
committer | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2013-03-21 10:57:27 -0300 |
commit | c8e96d6e91dc2e3d5b175cc4cd811398ab35c82d (patch) | |
tree | 0af842269f0b710ee4fd039d837888817484fc54 | |
parent | af8efcc7621397f26dc481aa481c2406a5b65057 (diff) | |
download | lua-github-c8e96d6e91dc2e3d5b175cc4cd811398ab35c82d.tar.gz |
-rw-r--r-- | liolib.c | 21 |
1 files changed, 11 insertions, 10 deletions
@@ -1,5 +1,5 @@ /* -** $Id: liolib.c,v 2.109 2013/03/16 21:10:18 roberto Exp roberto $ +** $Id: liolib.c,v 2.110 2013/03/20 19:40:07 roberto Exp roberto $ ** Standard I/O (and system) library ** See Copyright Notice in lua.h */ @@ -32,9 +32,15 @@ #if !defined(lua_checkmode) /* -** this macro can accept other 'modes' for 'fopen' besides the standard ones +** Check whether 'mode' matches '[rwa]%+?b?'. +** Change this macro to accept other modes for 'fopen' besides +** the standard ones. */ -#define lua_checkmode(mode) 0 +#define lua_checkmode(mode) \ + (*mode != '\0' && strchr("rwa", *(mode++)) != NULL && \ + (*mode != '+' || ++mode) && /* skip if char is '+' */ \ + (*mode != 'b' || ++mode) && /* skip if char is 'b' */ \ + (*mode == '\0')) #endif @@ -220,13 +226,8 @@ static int io_open (lua_State *L) { const char *filename = luaL_checkstring(L, 1); const char *mode = luaL_optstring(L, 2, "r"); LStream *p = newfile(L); - int i = 0; - /* check whether 'mode' matches '[rwa]%+?b?' */ - if (!(mode[i] != '\0' && strchr("rwa", mode[i++]) != NULL && - (mode[i] != '+' || ++i) && /* skip if char is '+' */ - (mode[i] != 'b' || ++i) && /* skip if char is 'b' */ - (mode[i] == '\0')) && !lua_checkmode(mode)) - return luaL_argerror(L, 2, "invalid mode"); + const char *md = mode; /* to traverse/check mode */ + luaL_argcheck(L, lua_checkmode(md), 2, "invalid mode"); p->f = fopen(filename, mode); return (p->f == NULL) ? luaL_fileresult(L, 0, filename) : 1; } |