Update the code a bit more, add a function to retreive the last error string and...

[simgear.git] / simgear / misc / sg_path.cxx

diff --git a/simgear/misc/sg_path.cxx b/simgear/misc/sg_path.cxx
index 1aeb12cefd59c52dbf8742ed44c722e6b886ebb5..54f7138dbcde9167cb979b3a93a74a769107c340 100644 (file)
--- a/simgear/misc/sg_path.cxx
+++ b/simgear/misc/sg_path.cxx
@@ -3,7 +3,7 @@
 //
 // Written by Curtis L. Olson, started April 1999.
 //
-// Copyright (C) 1999  Curtis L. Olson - curt@flightgear.org
+// Copyright (C) 1999  Curtis L. Olson - http://www.flightgear.org/~curt
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Library General Public
@@ -35,14 +35,19 @@
  * define directory path separators
  */
 
-#ifdef macintosh
+#if defined( macintosh )
 static const char sgDirPathSep = ':';
 static const char sgDirPathSepBad = '/';
 #else
 static const char sgDirPathSep = '/';
-static const char sgDirPathSepBad = ':';
+static const char sgDirPathSepBad = '\\';
 #endif
+
+#if defined( WIN32 ) && !defined(__CYGWIN__)
 static const char sgSearchPathSep = ';';
+#else
+static const char sgSearchPathSep = ':';
+#endif
 
 
 // If Unix, replace all ":" with "/".  If MacOS, replace all "/" with
@@ -107,6 +112,11 @@ void SGPath::append( const string& p ) {
     fix();
 }
 
+//add a new path component to the existing path string
+void SGPath::add( const string& p ) {
+    append( sgSearchPathSep+p );
+}
+
 
 // concatenate a string to the end of the path without inserting a
 // path separator
@@ -144,7 +154,7 @@ string SGPath::dir() const {
 // get the base part of the path (everything but the extension.)
 string SGPath::base() const {
     int index = path.rfind(".");
-    if (index >= 0) {
+    if ((index >= 0) && (path.find("/", index) == string::npos)) {
        return path.substr(0, index);
     } else {
        return "";
@@ -152,9 +162,11 @@ string SGPath::base() const {
 }
 
 // get the extention (everything after the final ".")
+// but make sure no "/" follows the "." character (otherwise it
+// is has to be a directory name containing a ".").
 string SGPath::extension() const {
     int index = path.rfind(".");
-    if (index >= 0) {
+    if ((index >= 0)  && (path.find("/", index) == string::npos)) {
        return path.substr(index + 1);
     } else {
        return "";
@@ -184,7 +196,8 @@ string_list sgPathSplit( const string &search_path ) {
             result.push_back( tmp.substr(0, index) );
             tmp = tmp.substr( index + 1 );
         } else {
-            result.push_back( tmp );
+            if ( !tmp.empty() )
+                result.push_back( tmp );
             done = true;
         }
     }