rusefi
/
lua
mirror of https://github.com/rusefi/lua.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

p-close returns "correct" status plus type of termination

This commit is contained in:
Roberto Ierusalimschy 2011-02-10 13:35:50 -02:00
parent bf8b08295a
commit 7b968bb514
1 changed files with 36 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
liolib.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: liolib.c,v 2.95 2010/11/10 18:05:36 roberto Exp roberto $ ** $Id: liolib.c,v 2.96 2011/01/26 16:30:02 roberto Exp roberto $
** Standard I/O (and system) library ** Standard I/O (and system) library
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -26,27 +26,44 @@
** lua_popen spawns a new process connected to the current one through ** lua_popen spawns a new process connected to the current one through
** the file streams. ** the file streams.
*/ */
#if !defined(lua_popen) #if !defined(lua_popen) /* { */
#if defined(LUA_USE_POPEN) #if defined(LUA_USE_POPEN) /* { */
#define lua_popen(L,c,m) ((void)L, fflush(NULL), popen(c,m)) #define lua_popen(L,c,m) ((void)L, fflush(NULL), popen(c,m))
#define lua_pclose(L,file) ((void)L, pclose(file))
#elif defined(LUA_WIN) #if defined(LUA_USE_POSIX) /* { */
#include <sys/wait.h>
#define lua_pclose(L,file,stat,tp) \
{(void)L; \
stat = pclose(file); \
if (stat == -1) { /* keep this value */ } \
else if (WIFEXITED(stat)) { stat = WEXITSTATUS(stat); tp = "exit"; } \
else if (WIFSIGNALED(stat)) { stat = WTERMSIG(stat); tp = "signal"; } \
else if (WIFSTOPPED(stat)) { stat = WSTOPSIG(stat); tp = "stop"; } }
#else /* }{ */
#define lua_pclose(L,file,stat,tp) {(void)L; stat = pclose(file);}
#endif /* } */
#elif defined(LUA_WIN) /* }{ */
#define lua_popen(L,c,m) ((void)L, _popen(c,m)) #define lua_popen(L,c,m) ((void)L, _popen(c,m))
#define lua_pclose(L,file) ((void)L, _pclose(file)) #define lua_pclose(L,file,stat,tp) {(void)L; stat = _pclose(file);}
#else #else /* }{ */
#define lua_popen(L,c,m) ((void)((void)c, m), \ #define lua_popen(L,c,m) ((void)((void)c, m), \
luaL_error(L, LUA_QL("popen") " not supported"), (FILE*)0) luaL_error(L, LUA_QL("popen") " not supported"), (FILE*)0)
#define lua_pclose(L,file) ((void)((void)L, file), -1) #define lua_pclose(L,file,stat,tp) {(void)L; (void)file; stat = -1;}
#endif #endif /* } */
#endif #endif /* } */
@ -142,13 +159,16 @@ static int io_noclose (lua_State *L) {
*/ */
static int io_pclose (lua_State *L) { static int io_pclose (lua_State *L) {
FILE **p = tofilep(L); FILE **p = tofilep(L);
int stat = lua_pclose(L, *p); int stat;
const char *tp = NULL; /* type of termination (when available) */
lua_pclose(L, *p, stat, tp);
*p = NULL; *p = NULL;
if (stat == -1) /* error? */ if (stat == -1) /* error? */
return pushresult(L, 0, NULL); return pushresult(L, 0, NULL);
else { else {
lua_pushinteger(L, stat); lua_pushinteger(L, stat);
return 1; /* return status */ lua_pushstring(L, tp);
return 2; /* return status and type */
} }
} }