CONSOLE: Handle unimplemented features for console toolchains.

This commit is contained in:
Mike Pall
2012-06-09 20:54:34 +02:00
parent 9f443e8b89
commit 37be8a5478
6 changed files with 41 additions and 2 deletions

View File

@@ -6,7 +6,6 @@
** Copyright (C) 1994-2008 Lua.org, PUC-Rio. See Copyright Notice in lua.h
*/
#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -34,9 +33,14 @@
#define lua_stdin_is_tty() 1
#endif
#if !LJ_TARGET_CONSOLE
#include <signal.h>
#endif
static lua_State *globalL = NULL;
static const char *progname = LUA_PROGNAME;
#if !LJ_TARGET_CONSOLE
static void lstop(lua_State *L, lua_Debug *ar)
{
(void)ar; /* unused arg. */
@@ -53,6 +57,7 @@ static void laction(int i)
terminate process (default action) */
lua_sethook(globalL, lstop, LUA_MASKCALL | LUA_MASKRET | LUA_MASKCOUNT, 1);
}
#endif
static void print_usage(void)
{
@@ -122,9 +127,13 @@ static int docall(lua_State *L, int narg, int clear)
int base = lua_gettop(L) - narg; /* function index */
lua_pushcfunction(L, traceback); /* push traceback function */
lua_insert(L, base); /* put it under chunk and args */
#if !LJ_TARGET_CONSOLE
signal(SIGINT, laction);
#endif
status = lua_pcall(L, narg, (clear ? 0 : LUA_MULTRET), base);
#if !LJ_TARGET_CONSOLE
signal(SIGINT, SIG_DFL);
#endif
lua_remove(L, base); /* remove traceback function */
/* force a complete garbage collection in case of errors */
if (status != 0) lua_gc(L, LUA_GCCOLLECT, 0);
@@ -484,7 +493,11 @@ static int runargs(lua_State *L, char **argv, int n)
static int handle_luainit(lua_State *L)
{
#if LJ_TARGET_CONSOLE
const char *init = NULL;
#else
const char *init = getenv(LUA_INIT);
#endif
if (init == NULL)
return 0; /* status OK */
else if (init[0] == '@')