lua

commit e39e758a73c08953d477c8e024ffbd1e2edfe6a5
parent 5438d77221e5f909b2f1990721ec56ec352b932b
Author: Roberto Ierusalimschy <roberto@inf.puc-rio.br>
Date:   Fri, 20 Feb 2009 10:50:03 -0300

closing a "popen" file returns the process exit status

Diffstat:
M
liolib.c
 | 
11
++++++++---
M
luaconf.h
 | 
8
++++----

2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/liolib.c b/liolib.c
@@ -1,5 +1,5 @@
 /*
-** $Id: liolib.c,v 2.78 2008/02/12 16:51:03 roberto Exp roberto $
+** $Id: liolib.c,v 2.79 2008/02/12 17:05:36 roberto Exp roberto $
 ** Standard I/O (and system) library
 ** See Copyright Notice in lua.h
 */
@@ -106,9 +106,14 @@ static int io_noclose (lua_State *L) {
 */
 static int io_pclose (lua_State *L) {
   FILE **p = tofilep(L);
-  int ok = lua_pclose(L, *p);
+  int stat = lua_pclose(L, *p);
   *p = NULL;
-  return pushresult(L, ok, NULL);
+  if (stat == -1)  /* error? */
+    return pushresult(L, 0, NULL);
+  else {
+    lua_pushinteger(L, stat);
+    return 1;  /* return status */
+  }
 }
 
 
diff --git a/luaconf.h b/luaconf.h
@@ -1,5 +1,5 @@
 /*
-** $Id: luaconf.h,v 1.101 2009/02/07 12:23:15 roberto Exp roberto $
+** $Id: luaconf.h,v 1.102 2009/02/18 13:17:10 roberto Exp roberto $
 ** Configuration file for Lua
 ** See Copyright Notice in lua.h
 */
@@ -695,18 +695,18 @@ union luai_Cast { double l_d; long l_l; };
 #if defined(LUA_USE_POPEN)
 
 #define lua_popen(L,c,m)	((void)L, fflush(NULL), popen(c,m))
-#define lua_pclose(L,file)	((void)L, (pclose(file) != -1))
+#define lua_pclose(L,file)	((void)L, pclose(file))
 
 #elif defined(LUA_WIN)
 
 #define lua_popen(L,c,m)	((void)L, _popen(c,m))
-#define lua_pclose(L,file)	((void)L, (_pclose(file) != -1))
+#define lua_pclose(L,file)	((void)L, _pclose(file))
 
 #else
 
 #define lua_popen(L,c,m)	((void)((void)c, m),  \
 		luaL_error(L, LUA_QL("popen") " not supported"), (FILE*)0)
-#define lua_pclose(L,file)		((void)((void)L, file), 0)
+#define lua_pclose(L,file)		((void)((void)L, file), -1)
 
 #endif