X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2Futil.cxx;h=0986e91ea47a71c93b9595c25affa837743abc22;hb=18d1593c42c2df60d7fb44ace722ca3e8a7fd82c;hp=3daeb991b712c4696cb481b59bc14dc958a73339;hpb=56d8181da3907eb159a591903c216fdce96fcb81;p=flightgear.git

diff --git a/src/Main/util.cxx b/src/Main/util.cxx
index 3daeb991b..0986e91ea 100644
--- a/src/Main/util.cxx
+++ b/src/Main/util.cxx
@@ -22,8 +22,10 @@
 
 #include <math.h>
 
+#include <cstdlib>
+
 #include <vector>
-SG_USING_STD(vector);
+using std::vector;
 
 #include <simgear/debug/logstream.hxx>
 
@@ -32,6 +34,9 @@ SG_USING_STD(vector);
 #include "globals.hxx"
 #include "util.hxx"
 
+#ifdef OSG_LIBRARY_STATIC
+#include "osgDB/Registry"
+#endif
 
 void
 fgDefaultWeatherValue (const char * propname, double value)
@@ -104,14 +109,12 @@ fgSetupWind (double min_hdg, double max_hdg, double speed, double gust)
 void
 fgExit (int status)
 {
-    // remove subsystems first, which need access to other subsystems in their
-    // destructors (e.g. "nasal")
-    SGSubsystem *sub = globals->get_subsystem("ai_model");
-    globals->get_subsystem_mgr()->get_group(SGSubsystemMgr::GENERAL)->remove_subsystem("ai_model");
-    delete sub;
+#ifdef OSG_LIBRARY_STATIC
+    osgDB::Registry::instance( true);
+#endif
 
     SG_LOG(SG_GENERAL, SG_INFO, "Exiting FlightGear with status " << status);
-    exit(status);
+    std::exit(status);
 }
 
 
@@ -120,7 +123,7 @@ double
 fgGetLowPass (double current, double target, double timeratio)
 {
     if ( timeratio < 0.0 ) {
-	if ( timeratio < -1.0 ) {
+        if ( timeratio < -1.0 ) {
                                 // time went backwards; kill the filter
                 current = target;
         } else {
@@ -142,5 +145,79 @@ fgGetLowPass (double current, double target, double timeratio)
     return current;
 }
 
+
+string
+fgUnescape (const char *s)
+{
+    string r;
+    while (*s) {
+        if (*s != '\\') {
+            r += *s++;
+            continue;
+        }
+        if (!*++s)
+            break;
+        if (*s == '\\') {
+            r += '\\';
+        } else if (*s == 'n') {
+            r += '\n';
+        } else if (*s == 'r') {
+            r += '\r';
+        } else if (*s == 't') {
+            r += '\t';
+        } else if (*s == 'v') {
+            r += '\v';
+        } else if (*s == 'f') {
+            r += '\f';
+        } else if (*s == 'a') {
+            r += '\a';
+        } else if (*s == 'b') {
+            r += '\b';
+        } else if (*s == 'x') {
+            if (!*++s)
+                break;
+            int v = 0;
+            for (int i = 0; i < 2 && isxdigit(*s); i++, s++)
+                v = v * 16 + (isdigit(*s) ? *s - '0' : 10 + tolower(*s) - 'a');
+            r += v;
+            continue;
+
+        } else if (*s >= '0' && *s <= '7') {
+            int v = *s++ - '0';
+            for (int i = 0; i < 3 && *s >= '0' && *s <= '7'; i++, s++)
+                v = v * 8 + *s - '0';
+            r += v;
+            continue;
+
+        } else {
+            r += *s;
+        }
+        s++;
+    }
+    return r;
+}
+
+
+// Write out path to validation node and read it back in. A Nasal
+// listener is supposed to replace the path with a validated version
+// or an empty string otherwise.
+const char *fgValidatePath (const char *str, bool write)
+{
+    static SGPropertyNode_ptr r, w;
+    if (!r) {
+        r = fgGetNode("/sim/paths/validate/read", true);
+        r->setAttribute(SGPropertyNode::READ, true);
+        r->setAttribute(SGPropertyNode::WRITE, true);
+
+        w = fgGetNode("/sim/paths/validate/write", true);
+        w->setAttribute(SGPropertyNode::READ, true);
+        w->setAttribute(SGPropertyNode::WRITE, true);
+    }
+    SGPropertyNode *prop = write ? w : r;
+    prop->setStringValue(str);
+    const char *result = prop->getStringValue();
+    return result[0] ? result : 0;
+}
+
 // end of util.cxx