X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2Futil.cxx;h=0986e91ea47a71c93b9595c25affa837743abc22;hb=b587400846111cc4d6713dcdd38b715c97923d5a;hp=6b916e862bb6434f098b76c5c81b233c95347a82;hpb=57a70fc14128ddc0996cf4f13a8e0f50228f663f;p=flightgear.git diff --git a/src/Main/util.cxx b/src/Main/util.cxx index 6b916e862..0986e91ea 100644 --- a/src/Main/util.cxx +++ b/src/Main/util.cxx @@ -22,8 +22,10 @@ #include +#include + #include -SG_USING_STD(vector); +using std::vector; #include @@ -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) { @@ -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