fly/flightgear
1
0
Fork 0
Code Activity

Support relative paths in 'loadxml' command

Browse source 
(relative to FG_ROOT or an aircraft dir)
This commit is contained in:
James Turner 2010-08-15 11:02:15 +01:00
parent 10eadf0c6e
commit bca3494462
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Main/fg_commands.cxx
View file

@ -1349,6 +1349,10 @@ do_load_xml_to_proptree(const SGPropertyNode * arg)
if (file.extension() != "xml") if (file.extension() != "xml")
file.concat(".xml"); file.concat(".xml");
if (file.isRelative()) {
file = globals->resolve_maybe_aircraft_path(file.str());
}
if (!fgValidatePath(file.c_str(), false)) { if (!fgValidatePath(file.c_str(), false)) {
SG_LOG(SG_IO, SG_ALERT, "loadxml: reading '" << file.str() << "' denied " SG_LOG(SG_IO, SG_ALERT, "loadxml: reading '" << file.str() << "' denied "
"(unauthorized access)"); "(unauthorized access)");