fly/flightgear
1
0
Fork 0
Code Activity

Anders GIDENSTAM: catch all exceptions to avoid aborting fgfs after

Browse source 
commands like "ls .."
This commit is contained in:
mfranz 2008-06-11 17:16:50 +00:00
parent 876bd2055c
commit 5cb6e43767
1 changed files with 18 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/Network/props.cxx
View file

@ -89,10 +89,9 @@ public:
void foundTerminator();
private:
/**
* Return a "Node no found" error message to the client.
*/
void node_not_found_error( const string& node_name );
inline void node_not_found_error( const string& s ) const {
throw "node '" + s + "' not found";
}
};
/**
@ -115,19 +114,6 @@ PropsChannel::collectIncomingData( const char* s, int n )
buffer.append( s, n );
}
/**
*
*/
void
PropsChannel::node_not_found_error( const string& node_name )
{
string error = "-ERR Node \"";
error += node_name;
error += "\" not found.";
push( error.c_str() );
push( getTerminator() );
}
// return a human readable form of the value "type"
static string
getValueTypeString( const SGPropertyNode *node )
@ -175,6 +161,7 @@ PropsChannel::foundTerminator()
SGPropertyNode* node = globals->get_props()->getNode( path.c_str() );
try {
if (!tokens.empty()) {
string command = tokens[0];
@ -192,7 +179,6 @@ PropsChannel::foundTerminator()
if (dir == 0) {
node_not_found_error( tokens[1] );
goto prompt;
}
}
@ -235,7 +221,6 @@ PropsChannel::foundTerminator()
}
else if ( command == "cd" ) {
if (tokens.size() == 2) {
try {
SGPropertyNode* child = node->getNode( tokens[1].c_str() );
if ( child ) {
node = child;
@ -243,9 +228,6 @@ PropsChannel::foundTerminator()
} else {
node_not_found_error( tokens[1] );
}
} catch (...) {
// Ignore attempt to move past root node with ".."
}
}
} else if ( command == "pwd" ) {
string ttt = node->getPath();
@ -393,7 +375,7 @@ PropsChannel::foundTerminator()
push( getTerminator() );
}
}
} else if (command == "quit") {
} else if ( command == "quit" || command == "exit" ) {
close();
shouldDelete();
return;
@ -420,7 +402,12 @@ set <var> <val> set <var> to a new <val>\r\n";
}
}
prompt:
} catch ( const string& msg ) {
string error = "-ERR \"" + msg + "\"";
push( error.c_str() );
push( getTerminator() );
}
if ( mode == PROMPT ) {
string prompt = node->getPath();
if (prompt.empty()) {