Merge branch 'jt/runway' into next

[flightgear.git] / src / Main / util.cxx

diff --git a/src/Main/util.cxx b/src/Main/util.cxx
index 1d0d6440f5ed2c3f9e92a207e06c1a0003aa2906..0986e91ea47a71c93b9595c25affa837743abc22 100644 (file)
--- 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>
 
@@ -112,7 +114,7 @@ fgExit (int status)
 #endif
 
     SG_LOG(SG_GENERAL, SG_INFO, "Exiting FlightGear with status " << status);
-    exit(status);
+    std::exit(status);
 }
 
 
@@ -145,7 +147,7 @@ fgGetLowPass (double current, double target, double timeratio)
 
 
 string
-fgUnescape(const char *s)
+fgUnescape (const char *s)
 {
     string r;
     while (*s) {
@@ -168,9 +170,9 @@ fgUnescape(const char *s)
         } 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;
@@ -195,5 +197,27 @@ fgUnescape(const char *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