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

'luaL_execresult' does not assume -1 status as error 

ISO C is silent about the return of 'system'. Windows sets 'errno' in
case of errors. Linux has several different error cases, with different
return values. ISO C allows 'system' to set 'errno' even if there are no
errors. Here we assume that a status==0 is success (which is the case
on several platforms), otherwise it is an error. If there is an error
number, gives the error based on it. (The worst a spurious 'errno'
can do is to generate a bad error message.) Otherwise uses the normal
results.
This commit is contained in:
Roberto Ierusalimschy 2020-05-22 15:39:29 -03:00
parent 17dbaa8639
commit efcf24be0c
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lauxlib.c
View File

@ -284,7 +284,7 @@ LUALIB_API int luaL_fileresult (lua_State *L, int stat, const char *fname) {
LUALIB_API int luaL_execresult (lua_State *L, int stat) { LUALIB_API int luaL_execresult (lua_State *L, int stat) {
const char *what = "exit"; /* type of termination */ const char *what = "exit"; /* type of termination */
if (stat == -1) /* error? */ if (stat != 0 && errno != 0) /* error with an 'errno'? */
return luaL_fileresult(L, 0, NULL); return luaL_fileresult(L, 0, NULL);
else { else {
l_inspectstat(stat, what); /* interpret result */ l_inspectstat(stat, what); /* interpret result */

1
liolib.c
View File

@ -270,6 +270,7 @@ static int io_open (lua_State *L) {
*/ */
static int io_pclose (lua_State *L) { static int io_pclose (lua_State *L) {
LStream *p = tolstream(L); LStream *p = tolstream(L);
errno = 0;
return luaL_execresult(L, l_pclose(L, p->f)); return luaL_execresult(L, l_pclose(L, p->f));
} }

6
loslib.c
View File

@ -10,6 +10,7 @@
#include "lprefix.h" #include "lprefix.h"
#include <errno.h>
#include <locale.h> #include <locale.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -138,10 +139,11 @@
static int os_execute (lua_State *L) { static int os_execute (lua_State *L) {
const char *cmd = luaL_optstring(L, 1, NULL); const char *cmd = luaL_optstring(L, 1, NULL);
int stat = system(cmd); int stat;
errno = 0;
stat = system(cmd);
if (cmd != NULL) if (cmd != NULL)
return luaL_execresult(L, stat); return luaL_execresult(L, stat);
else { else {