nik/lush
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

does not accept garbage after options (e.g., -ixxx)

Browse Source
This commit is contained in:
Roberto Ierusalimschy
2006-05-24 11:16:39 -03:00
parent c408158047
commit 20f4bbdc3a
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lua.c
View File

@@ -1,5 +1,5 @@
/* /*
** $Id: lua.c,v 1.157 2005/12/29 16:23:32 roberto Exp roberto $ ** $Id: lua.c,v 1.158 2006/04/10 18:27:23 roberto Exp roberto $
** Lua stand-alone interpreter ** Lua stand-alone interpreter
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@@ -252,17 +252,30 @@ static int handle_script (lua_State *L, char **argv, int n) {
} }
/* check that argument has no extra characters at the end */
#define notail(x) {if ((x)[2] != '\0') return -1;}
static int collectargs (char **argv, int *pi, int *pv, int *pe) { static int collectargs (char **argv, int *pi, int *pv, int *pe) {
int i; int i;
for (i = 1; argv[i] != NULL; i++) { for (i = 1; argv[i] != NULL; i++) {
if (argv[i][0] != '-') /* not an option? */ if (argv[i][0] != '-') /* not an option? */
return i; return i;
switch (argv[i][1]) { /* option */ switch (argv[i][1]) { /* option */
case '-': return (argv[i+1] != NULL ? i+1 : 0); case '-':
case '\0': return i; notail(argv[i]);
case 'i': *pi = 1; /* go through */ return (argv[i+1] != NULL ? i+1 : 0);
case 'v': *pv = 1; break; case '\0':
case 'e': *pe = 1; /* go through */ return i;
case 'i':
notail(argv[i]);
*pi = 1; /* go through */
case 'v':
notail(argv[i]);
*pv = 1;
break;
case 'e':
*pe = 1; /* go through */
case 'l': case 'l':
if (argv[i][2] == '\0') { if (argv[i][2] == '\0') {
i++; i++;