X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FNetwork%2Fprops.cxx;h=3692a5cfe6ec49fed2c8197df9d5c780b1b61c99;hb=7d3448294bc7486af3f4c1f0ff5c8493b03ffc90;hp=f9c3b8b37c0dc7461bc98169cc87b2c89a606fbb;hpb=9b11ee221e04314481b7d9ed594d6fc7ddb42bfd;p=flightgear.git

diff --git a/src/Network/props.cxx b/src/Network/props.cxx
index f9c3b8b37..3692a5cfe 100644
--- a/src/Network/props.cxx
+++ b/src/Network/props.cxx
@@ -21,13 +21,15 @@
 // $Id$
 
 
-#include <Main/globals.hxx>
 
 #include <simgear/compiler.h>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/io/iochannel.hxx>
 #include <simgear/math/sg_types.hxx>
 #include <simgear/misc/props.hxx>
+#include <simgear/misc/props_io.hxx>
+
+#include <Main/globals.hxx>
 
 #include <stdlib.h>		// atoi() atof()
 
@@ -38,6 +40,7 @@
 #if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
 SG_USING_STD(cout);
 SG_USING_STD(istrstream);
+SG_USING_STD(strstream);
 #endif
 
 FGProps::FGProps() {
@@ -127,18 +130,18 @@ bool FGProps::process_command( const char *cmd ) {
 
     string command = tokens[0];
 
-    SGPropertyNode * node = globals->get_props()->getNode(path);
+    SGPropertyNode * node = globals->get_props()->getNode(path.c_str());
 
     if ( command == "ls" ) {
 	SGPropertyNode * dir = node;
 	if ( tokens.size() > 2 ) {
 	    if ( tokens[1][0] == '/' ) {
-		dir = globals->get_props()->getNode(tokens[1]);
+		dir = globals->get_props()->getNode(tokens[1].c_str());
 	    } else {
-		dir = globals->get_props()->getNode(path + "/" + tokens[1]);
+		dir = globals->get_props()->getNode((path + "/" + tokens[1]).c_str());
 	    }
 	    if ( dir == 0 ) {
-		tokens[1] += " Not Found\n";
+		tokens[1] = "ERR Node \"" + tokens[1] + "\" not found.\n";
 		io->writestring( tokens[1].c_str() );
 		return true;
 	    }
@@ -148,17 +151,18 @@ bool FGProps::process_command( const char *cmd ) {
 	    SGPropertyNode * child = dir->getChild(i);
 	    string name = child->getName();
 	    string line = name;
-	    if ( dir->getChild(name, 1) ) {
+	    if ( dir->getChild(name.c_str(), 1) ) {
+		char buf[16];
 		sprintf(buf, "[%d]", child->getIndex());
 		line += buf;
 	    }
 	    if ( child->nChildren() > 0 ) {
 		line += "/";
 	    } else {
-		if (mode == PROMPT) {
-		    string value = dir->getStringValue ( name, "" );
+		if ( mode == PROMPT ) {
+		    string value = dir->getStringValue ( name.c_str(), "" );
 		    line += " =\t'" + value + "'\t(";
-		    line += getValueTypeString( dir->getNode( name ) );
+		    line += getValueTypeString( dir->getNode( name.c_str() ) );
 		    line += ")";
 		}
 	    }
@@ -172,12 +176,12 @@ bool FGProps::process_command( const char *cmd ) {
 	    io->writestring( buf.str() );
 	}
 	else {
-	    SGPropertyNode *child = node->getNode(tokens[1]);
+	    SGPropertyNode *child = node->getNode(tokens[1].c_str());
 	    if ( child ) {
 		writeProperties ( buf, child );
 		io->writestring( buf.str() );
 	    } else {
-		tokens[1] += " Not Found\n";
+		tokens[1] = "ERR Node \"" + tokens[1] + "\" not found.\n";
 		io->writestring( tokens[1].c_str() );
 	    }
 	}
@@ -188,18 +192,18 @@ bool FGProps::process_command( const char *cmd ) {
         if ( tokens.size() <= 1 ) {
 	    // do nothing
 	} else {
-	    SGPropertyNode *child = node->getNode(tokens[1]);
+	    SGPropertyNode *child = node->getNode(tokens[1].c_str());
 	    if ( child ) {
 		node = child;
 		path = node->getPath();
 	    } else {
-		tokens[1] += " Not Found\n";
+		tokens[1] = "ERR Node \"" + tokens[1] + "\" not found.\n";
 		io->writestring( tokens[1].c_str() );
 	    }
 	}
     } else if ( command == "pwd" ) {
 	string ttt = node->getPath();
-	if ( ttt == "" ) {
+	if ( ttt.empty() ) {
 	    ttt = "/";
 	}
 	ttt += "\n";
@@ -209,13 +213,10 @@ bool FGProps::process_command( const char *cmd ) {
 	    // do nothing
 	} else {
 	    string tmp;	
-	    string value = node->getStringValue ( tokens[1], "" );
+	    string value = node->getStringValue ( tokens[1].c_str(), "" );
 	    if ( mode == PROMPT ) {
-		string ttt = "debug = '" + tokens[1] + "'\n";
-		io->writestring( ttt.c_str() );
-
 		tmp = tokens[1] + " = '" + value + "' (";
-		tmp += getValueTypeString( node->getNode( tokens[1] ) );
+		tmp += getValueTypeString( node->getNode( tokens[1].c_str() ) );
 		tmp += ")\n";
  	    } else {
 		tmp = value + "\n";
@@ -226,16 +227,22 @@ bool FGProps::process_command( const char *cmd ) {
         if ( tokens.size() <= 2 ) {
 	    // do nothing
 	} else {
-	    node->getNode( tokens[1], true )->setStringValue(tokens[2]);
-
-	    // now fetch and write out the new value as confirmation
-	    // of the change
-	    string value = node->getStringValue ( tokens[1], "" );
-	    string tmp = tokens[1] + " = '" + value + "' (";
-	    tmp += getValueTypeString( node->getNode( tokens[1] ) );
-	    tmp += ")\n";
- 
-	    io->writestring( tmp.c_str() );
+	    string tmp = tokens[2];
+	    for ( unsigned int i = 3; i < tokens.size() - 1; i++ ) {
+		tmp += " " + tokens[i];
+	    }
+	    node->getNode( tokens[1].c_str(), true )->setStringValue(tmp.c_str());
+
+	    if ( mode == PROMPT ) {
+		// now fetch and write out the new value as confirmation
+		// of the change
+		string value = node->getStringValue ( tokens[1].c_str(), "" );
+		string tmp = tokens[1] + " = '" + value + "' (";
+		tmp += getValueTypeString( node->getNode( tokens[1].c_str() ) );
+		tmp += ")\n";
+
+		io->writestring( tmp.c_str() );
+	    }
 	}
     } else if ( command == "quit" ) {
 	close();
@@ -265,7 +272,7 @@ bool FGProps::process_command( const char *cmd ) {
 
     if ( mode == PROMPT ) {
 	string prompt = node->getPath();
-	if ( prompt == "" ) {
+	if ( prompt.empty() ) {
 	    prompt = "/";
 	}
 	prompt += "> ";
@@ -278,6 +285,7 @@ bool FGProps::process_command( const char *cmd ) {
 // process work for this port
 bool FGProps::process() {
     SGIOChannel *io = get_io_channel();
+    char buf[max_cmd_len];
 
     // cout << "processing incoming props command" << endl;