//
// 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
static const char sgDirPathSepBad = '\\';
#endif
-#if defined( WIN32 )
+#if defined( WIN32 ) && !defined(__CYGWIN__)
static const char sgSearchPathSep = ';';
#else
static const char sgSearchPathSep = ':';
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
// 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 "";
}
// 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 "";
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;
}
}