fly/flightgear
1
0
Fork 0
Code Activity

Add possibility to call ls2 telnet command without dir parameter (like for ls command)

Browse source
This commit is contained in:
Roman Ludwicki 2022-11-12 14:49:40 +01:00 committed by Florent Rougon
parent 535c5a5ff1
commit ec52a4ee7b
1 changed files with 29 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/Network/props.cxx
View file

@ -111,6 +111,8 @@ private:
typedef string_list ParameterList; typedef string_list ParameterList;
SGPropertyNode* getLsDir(SGPropertyNode* node, const ParameterList &tokens);
inline void node_not_found_error( const string& s ) const { inline void node_not_found_error( const string& s ) const {
throw "node '" + s + "' not found"; throw "node '" + s + "' not found";
} }
@ -330,21 +332,7 @@ FGProps::PropsChannel::foundTerminator()
string command = tokens[0]; string command = tokens[0];
if (command == "ls") { if (command == "ls") {
SGPropertyNode* dir = node; SGPropertyNode* dir = getLsDir(node, tokens);
if (tokens.size() == 2) {
if (tokens[1][0] == '/') {
dir = globals->get_props()->getNode( tokens[1].c_str() );
} else {
string s = path;
s += "/";
s += tokens[1];
dir = globals->get_props()->getNode( s.c_str() );
}
if (dir == 0) {
node_not_found_error( tokens[1] );
}
}
for (int i = 0; i < dir->nChildren(); i++) { for (int i = 0; i < dir->nChildren(); i++) {
SGPropertyNode * child = dir->getChild(i); SGPropertyNode * child = dir->getChild(i);
@ -367,7 +355,7 @@ FGProps::PropsChannel::foundTerminator()
push( line.c_str() ); push( line.c_str() );
} }
} else if (command == "ls2") { } else if (command == "ls2") {
SGPropertyNode* dir = globals->get_props()->getNode(tokens[1]); SGPropertyNode* dir = getLsDir(node, tokens);
if (dir) { if (dir) {
int n = dir->nChildren(); int n = dir->nChildren();
for (int i = 0; i < n; i++) { for (int i = 0; i < n; i++) {
@ -721,6 +709,31 @@ nasal [EOF <marker>] execute arbitrary Nasal code (simulator must be running wi
buffer.remove(); buffer.remove();
} }
/**
* Return directory to use with ls or ls2 command.
*/
SGPropertyNode*
FGProps::PropsChannel::getLsDir(SGPropertyNode* node, const ParameterList &tokens)
{
SGPropertyNode* dir = node;
if (tokens.size() == 2) {
if (tokens[1][0] == '/') {
dir = globals->get_props()->getNode( tokens[1] );
} else {
string s = path;
s += "/";
s += tokens[1];
dir = globals->get_props()->getNode( s );
}
if (dir == nullptr) {
node_not_found_error( tokens[1] );
}
}
return dir;
}
/** /**
* *
*/ */