Bring back old version of system() and use mine as execute()

voron00 · Jan 2, 2016 · 0e11302 · 0e11302
1 parent fe5bfb6
commit 0e11302
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/gsc.cpp b/gsc.cpp
@@ -256,6 +256,7 @@ Scr_Function scriptFunctions[] = {
 	{"getAscii"                       , gsc_utils_getAscii                    , 0},
 	{"toUpper"                        , gsc_utils_toupper                     , 0},
 	{"system"                         , gsc_utils_system                      , 0},
+	{"execute"                        , gsc_utils_execute                     , 0},
 	{"file_link"                      , gsc_utils_file_link                   , 0},
 	{"file_unlink"                    , gsc_utils_file_unlink                 , 0},
 	{"file_exists"                    , gsc_utils_file_exists                 , 0},

diff --git a/gsc_utils.cpp b/gsc_utils.cpp
@@ -529,6 +529,17 @@ void gsc_utils_toupper() {
 	stackPushString(result);
 }
 
+void gsc_utils_system() { // closer 903, "ls"
+	char *cmd;
+	if ( ! stackGetParams("s",  &cmd)) {
+		printf("scriptengine> ERROR: please specify the command as string to gsc_system_command()\n");
+		stackPushUndefined();
+		return;
+	}
+	setenv("LD_PRELOAD", "", 1); // dont inherit lib of parent
+	stackPushInt( system(cmd) );
+}
+
 // http://stackoverflow.com/questions/1583234/c-system-function-how-to-collect-the-output-of-the-issued-command
 // Calling function must free the returned result.
 char* exec(const char* command) {
@@ -567,10 +578,10 @@ char* exec(const char* command) {
   return result;
 }
 
-void gsc_utils_system() { // Returns complete command output as a string
+void gsc_utils_execute() { // Returns complete command output as a string
 	char *cmd;
 	if ( ! stackGetParams("s",  &cmd)) {
-		printf("scriptengine> ERROR: please specify the command as string to gsc_system_command()\n");
+		printf("scriptengine> ERROR: please specify the command as string to gsc_execute_command()\n");
 		stackPushUndefined();
 		return;
 	}

diff --git a/gsc_utils.hpp b/gsc_utils.hpp
@@ -20,6 +20,7 @@ void gsc_utils_disableGlobalPlayerCollision();
 void gsc_utils_getAscii();
 void gsc_utils_toupper();
 void gsc_utils_system();
+void gsc_utils_execute();
 void gsc_utils_file_link();
 void gsc_utils_file_unlink();
 void gsc_utils_file_exists();