From ae57f3cd467a742755baab7ea4f46463d16f8674 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Fri, 12 Jan 2018 19:52:31 +0000
Subject: [PATCH] Added ability to toggle on/off use of C system() function
 call, using OSG_SYSTEM_SUPPORTED Cmake option

---
 CMakeLists.txt                               |  1 +
 include/osg/os_utils                         | 18 +++++++++++++++++-
 src/osg/Config.in                            |  1 +
 src/osgPlugins/lua/lua-5.2.3/src/loslib.c    |  6 ++++++
 src/osgPlugins/osgtgz/ReaderWriterOSGTGZ.cpp |  5 +++--
 src/osgPlugins/tgz/ReaderWriterTGZ.cpp       |  5 +++--
 src/osgPresentation/KeyEventHandler.cpp      |  3 ++-
 src/osgPresentation/PickEventHandler.cpp     |  3 ++-
 src/osgPresentation/SlideEventHandler.cpp    |  5 +++--
 src/osgPresentation/SlideShowConstructor.cpp |  3 ++-
 10 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 285725729..0cde1104e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -480,6 +480,7 @@ OPTION(OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION "Set to ON to use the ref_ptr<
 OPTION(OSG_USE_REF_PTR_SAFE_DEREFERENCE "Set to ON to throw an exception whenever ref_ptr<> is dereferenced or called. " OFF)
 
 OPTION(OSG_ENVVAR_SUPPORTED "Set to ON to build OpenSceneGraph with the OSG_ENVVAR_SUPPOERTED #define enabled to enable use of getenv() related functions." ON)
+OPTION(OSG_SYSTEM_SUPPORTED "Set to ON to build OpenSceneGraph with the OSG_SYSTEM_SUPPOERTED #define enabled to enable use of system() related functions." ON)
 
 
 
diff --git a/include/osg/os_utils b/include/osg/os_utils
index 95ad47c3e..2caf78a9f 100644
--- a/include/osg/os_utils
+++ b/include/osg/os_utils
@@ -16,13 +16,29 @@
 
 #include <osg/Config>
 
-#ifdef OSG_ENVVAR_SUPPORTED
+#if defined(OSG_SYSTEM_SUPPORTED) || defined(OSG_ENVVAR_SUPPORTED)
     #include <stdlib.h>
+#endif
+
+#ifdef OSG_ENVVAR_SUPPORTED
     #include <sstream>
 #endif
 
 namespace osg {
 
+#ifdef OSG_SYSTEM_SUPPORTED
+inline int system(const char* command)
+{
+    return ::system(command);
+}
+#else
+inline int system(const char* command)
+{
+    OSG_WARN<<"system("<<command<<") not supported on this platform."<<std::endl;
+    return 0;
+}
+#endif
+
 inline unsigned int getClampedLength(const char* str, unsigned int maxNumChars=4096)
 {
     unsigned int i = 0;
diff --git a/src/osg/Config.in b/src/osg/Config.in
index 8f4c23359..610b407df 100644
--- a/src/osg/Config.in
+++ b/src/osg/Config.in
@@ -35,5 +35,6 @@
 #cmakedefine OSG_PROVIDE_READFILE
 #cmakedefine OSG_USE_DEPRECATED_API
 #cmakedefine OSG_ENVVAR_SUPPORTED
+#cmakedefine OSG_SYSTEM_SUPPORTED
 
 #endif
diff --git a/src/osgPlugins/lua/lua-5.2.3/src/loslib.c b/src/osgPlugins/lua/lua-5.2.3/src/loslib.c
index 052ba1744..5a7904a6b 100644
--- a/src/osgPlugins/lua/lua-5.2.3/src/loslib.c
+++ b/src/osgPlugins/lua/lua-5.2.3/src/loslib.c
@@ -19,6 +19,7 @@
 #include "lauxlib.h"
 #include "lualib.h"
 
+#include <osg/Config>
 
 /*
 ** list of valid conversion specifiers for the 'strftime' function
@@ -78,6 +79,8 @@
 
 
 static int os_execute (lua_State *L) {
+
+#if defined(OSG_SYSTEM_SUPPORTED)
   const char *cmd = luaL_optstring(L, 1, NULL);
   int stat = system(cmd);
   if (cmd != NULL)
@@ -86,6 +89,9 @@ static int os_execute (lua_State *L) {
     lua_pushboolean(L, stat);  /* true if there is a shell */
     return 1;
   }
+#else
+    return 0;
+#endif
 }
 
 
diff --git a/src/osgPlugins/osgtgz/ReaderWriterOSGTGZ.cpp b/src/osgPlugins/osgtgz/ReaderWriterOSGTGZ.cpp
index 372d3e61b..788875a22 100644
--- a/src/osgPlugins/osgtgz/ReaderWriterOSGTGZ.cpp
+++ b/src/osgPlugins/osgtgz/ReaderWriterOSGTGZ.cpp
@@ -8,6 +8,7 @@
 #include <osg/Geode>
 #include <osg/Group>
 #include <osg/Notify>
+#include <osg/os_utils>
 
 #include <osgDB/Registry>
 #include <osgDB/ReadFile>
@@ -77,7 +78,7 @@ class sgReaderWriterOSGTGZ : public osgDB::ReaderWriter
             mkdir( dirname, 0700 );
         #endif
 
-            if ( system( command ) ) {
+            if (osg::system( command ) ) {
                 return ReadResult::FILE_NOT_HANDLED;
             }
 
@@ -107,7 +108,7 @@ class sgReaderWriterOSGTGZ : public osgDB::ReaderWriter
 
             sprintf( command, "rm -rf %s", dirname );
         #endif
-            if ( system( command ) ) {
+            if (osg::system( command ) ) {
                 return ReadResult::FILE_NOT_HANDLED;
             }
 
diff --git a/src/osgPlugins/tgz/ReaderWriterTGZ.cpp b/src/osgPlugins/tgz/ReaderWriterTGZ.cpp
index 1b98333fe..d9345bd19 100644
--- a/src/osgPlugins/tgz/ReaderWriterTGZ.cpp
+++ b/src/osgPlugins/tgz/ReaderWriterTGZ.cpp
@@ -8,6 +8,7 @@
 #include <osg/Geode>
 #include <osg/Group>
 #include <osg/Notify>
+#include <osg/os_utils>
 
 #include <osgDB/ReadFile>
 #include <osgDB/FileUtils>
@@ -94,7 +95,7 @@ class ReaderWriterTGZ : public osgDB::ReaderWriter
 
             OSG_NOTICE<<"Running command '"<<command<<"'"<<std::endl;
 
-            int result = system( command );
+            int result = osg::system( command );
             if (result!=0) return ReadResult::ERROR_IN_READING_FILE;
 
 
@@ -137,7 +138,7 @@ class ReaderWriterTGZ : public osgDB::ReaderWriter
         #endif
             OSG_NOTICE<<"Running command '"<<command<<"'"<<std::endl;
 
-            result = system( command );
+            result = osg::system( command );
             if (result!=0) return ReadResult::ERROR_IN_READING_FILE;
 
             if( grp->getNumChildren() == 0 )
diff --git a/src/osgPresentation/KeyEventHandler.cpp b/src/osgPresentation/KeyEventHandler.cpp
index f08fdc003..1b7e7dc6d 100644
--- a/src/osgPresentation/KeyEventHandler.cpp
+++ b/src/osgPresentation/KeyEventHandler.cpp
@@ -14,6 +14,7 @@
 #include <osgPresentation/SlideEventHandler>
 
 #include <osgViewer/Viewer>
+#include <osg/os_utils>
 #include <osg/Notify>
 #include <osgDB/FileUtils>
 
@@ -119,7 +120,7 @@ void KeyEventHandler::doOperation()
 
             bool commandRunsInBackground = (_command.find("&")!=std::string::npos);
 
-            int result = system(_command.c_str());
+            int result = osg::system(_command.c_str());
 
             OSG_INFO<<"system("<<_command<<") result "<<result<<std::endl;
 
diff --git a/src/osgPresentation/PickEventHandler.cpp b/src/osgPresentation/PickEventHandler.cpp
index ee1c1f387..abbc6c034 100644
--- a/src/osgPresentation/PickEventHandler.cpp
+++ b/src/osgPresentation/PickEventHandler.cpp
@@ -17,6 +17,7 @@
 #include <osg/Notify>
 #include <osgDB/FileUtils>
 #include <osg/io_utils>
+#include <osg/os_utils>
 
 #include <stdlib.h>
 
@@ -230,7 +231,7 @@ void PickEventHandler::doOperation()
 
             bool commandRunsInBackground = (_command.find("&")!=std::string::npos);
 
-            int result = system(_command.c_str());
+            int result = osg::system(_command.c_str());
 
             OSG_INFO<<"system("<<_command<<") result "<<result<<std::endl;
 
diff --git a/src/osgPresentation/SlideEventHandler.cpp b/src/osgPresentation/SlideEventHandler.cpp
index 4c3d22a04..96013b43f 100644
--- a/src/osgPresentation/SlideEventHandler.cpp
+++ b/src/osgPresentation/SlideEventHandler.cpp
@@ -21,6 +21,7 @@
 #include <osg/AlphaFunc>
 #include <osg/Timer>
 #include <osg/io_utils>
+#include <osg/os_utils>
 
 #include <osgUtil/TransformCallback>
 #include <osgUtil/GLObjectsVisitor>
@@ -420,7 +421,7 @@ struct LayerAttributesOperator : public ObjectOperator
                 OSG_NOTICE<<"Run "<<itr->c_str()<<std::endl;
                 osg::Timer_t startTick = osg::Timer::instance()->tick();
 
-                int result = system(itr->c_str());
+                int result = osg::system(itr->c_str());
 
                 OSG_INFO<<"system("<<*itr<<") result "<<result<<std::endl;
 
@@ -1257,7 +1258,7 @@ bool SlideEventHandler::handle(const osgGA::GUIEventAdapter& ea,osgGA::GUIAction
                     std::stringstream command;
                     command<<editor<<" "<<filename<<" &"<<std::endl;
 
-                    int result = system(command.str().c_str());
+                    int result = osg::system(command.str().c_str());
 
                     OSG_INFO<<"system("<<command.str()<<") result "<<result<<std::endl;
 
diff --git a/src/osgPresentation/SlideShowConstructor.cpp b/src/osgPresentation/SlideShowConstructor.cpp
index 450c67b1a..ad5d9ee8c 100644
--- a/src/osgPresentation/SlideShowConstructor.cpp
+++ b/src/osgPresentation/SlideShowConstructor.cpp
@@ -31,6 +31,7 @@
 #include <osg/ComputeBoundsVisitor>
 #include <osg/Notify>
 #include <osg/io_utils>
+#include <osg/os_utils>
 #include <osg/ValueObject>
 
 #include <osgUtil/TransformCallback>
@@ -1749,7 +1750,7 @@ void SlideShowConstructor::addGraph(const std::string& contents, const PositionD
 
     std::stringstream command;
     command<<"dot -Tsvg "<<dotFileName<<" -o "<<tmpSvgFileName;
-    int result = system(command.str().c_str());
+    int result = osg::system(command.str().c_str());
     if (result==0)
     {
         osg::ref_ptr<osgDB::Options> previousOptions = _options;