Fix file access mode for newnavradio.[ch]xx

[flightgear.git] / src / Airports / xmlloader.cxx

diff --git a/src/Airports/xmlloader.cxx b/src/Airports/xmlloader.cxx
index b5bce6345883194ddcdf7fb69d3e73979661991a..b2ce07ed4b3fdbb28975f48a48685f4db96b6994 100644 (file)
--- a/src/Airports/xmlloader.cxx
+++ b/src/Airports/xmlloader.cxx
@@ -13,9 +13,13 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 
-#include <simgear/misc/sg_path.hxx>
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
+#include <simgear/misc/sg_path.hxx>
 #include <simgear/xml/easyxml.hxx>
+#include <simgear/misc/strutils.hxx>
 
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
@@ -85,8 +89,7 @@ bool XMLLoader::findAirportData(const std::string& aICAO,
     const std::string& aFileName, SGPath& aPath)
 {
   string fileName(aFileName);
-  int extPos = fileName.size() - 4;
-  if ((int) fileName.rfind(".xml") != extPos) {
+  if (!simgear::strutils::ends_with(aFileName, ".xml")) {
     fileName.append(".xml");
   }
   
@@ -97,13 +100,16 @@ bool XMLLoader::findAirportData(const std::string& aICAO,
     aICAO.c_str(), fileName.c_str());
 
   for (string_list_iterator it = sc.begin(); it != sc.end(); ++it) {
-    SGPath path(*it);
-    path.append("Airports");
-    path.append(string(buffer));
-    if (path.exists()) {
-      aPath = path;
-      return true;
-    } // of path exists
+    // fg_senery contains empty strings as "markers" (see FGGlobals::set_fg_scenery)
+    if (!it->empty()) {
+        SGPath path(*it);
+        path.append("Airports");
+        path.append(string(buffer));
+        if (path.exists()) {
+          aPath = path;
+          return true;
+        } // of path exists
+    }
   } // of scenery path iteration
   return false;
 }