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

environment variables consulted by Lua may be version-specific

Browse Source
This commit is contained in:
Roberto Ierusalimschy
2010-07-25 12:03:37 -03:00
parent 85c1461422
commit 73b0a3451d
2 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lua.c
View File

@@ -1,5 +1,5 @@
/*
** $Id: lua.c,v 1.190 2010/04/14 15:14:21 roberto Exp roberto $
** $Id: lua.c,v 1.191 2010/07/02 17:36:32 roberto Exp roberto $
** Lua stand-alone interpreter
** See Copyright Notice in lua.h
*/
@@ -31,10 +31,13 @@
#define LUA_MAXINPUT 512
#endif
#if !defined(LUA_INIT_VAR)
#define LUA_INIT_VAR "LUA_INIT"
#if !defined(LUA_INIT)
#define LUA_INIT "LUA_INIT"
#endif
#define LUA_INITVERSION \
LUA_INIT "_" LUA_VERSION_MAJOR "_" LUA_VERSION_MINOR
/*
** lua_stdin_is_tty detects whether the standard input is a 'tty' (that
@@ -409,12 +412,17 @@ static int runargs (lua_State *L, char **argv, int n) {
static int handle_luainit (lua_State *L) {
const char *init = getenv(LUA_INIT_VAR);
const char *name = "=" LUA_INITVERSION;
const char *init = getenv(name + 1);
if (init == NULL) {
name = "=" LUA_INIT;
init = getenv(name + 1); /* try alternative name */
}
if (init == NULL) return LUA_OK;
else if (init[0] == '@')
return dofile(L, init+1);
else
return dostring(L, init, "=" LUA_INIT_VAR);
return dostring(L, init, name);
}