diff options
Diffstat (limited to 'src/lua.c')
| -rw-r--r-- | src/lua.c | 13 |
1 files changed, 7 insertions, 6 deletions
@@ -1,5 +1,5 @@ /* -** $Id: lua.c,v 1.192 2010/07/25 15:03:37 roberto Exp $ +** $Id: lua.c,v 1.194 2010/10/25 19:01:37 roberto Exp $ ** Lua stand-alone interpreter ** See Copyright Notice in lua.h */ @@ -369,10 +369,11 @@ static int collectargs (char **argv, int *pi, int *pv, int *pe) { break; case 'e': *pe = 1; /* go through */ - case 'l': - if (argv[i][2] == '\0') { - i++; - if (argv[i] == NULL) return -(i - 1); + case 'l': /* both options need an argument */ + if (argv[i][2] == '\0') { /* no concatenated argument? */ + i++; /* try next 'argv' */ + if (argv[i] == NULL || argv[i][0] == '-') + return -(i - 1); /* no next argument or it is another option */ } break; default: /* invalid option; return its index... */ @@ -427,7 +428,7 @@ static int handle_luainit (lua_State *L) { static int pmain (lua_State *L) { - int argc = lua_tointeger(L, 1); + int argc = (int)lua_tointeger(L, 1); char **argv = (char **)lua_touserdata(L, 2); int script; int has_i = 0, has_v = 0, has_e = 0; |