X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fmisc%2Fsg_path.cxx;h=6055becd8810bcb81caca3f362677a2daa66ae7f;hb=2e71b64de1d937e2b7c34dd4a2365be455d0b82a;hp=dc9be8eb627350b7e06b6c5e03bc5255f940d73a;hpb=b63464d23982dda01458fbe4b411e878a4feeea8;p=simgear.git diff --git a/simgear/misc/sg_path.cxx b/simgear/misc/sg_path.cxx index dc9be8eb..6055becd 100644 --- 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 @@ -15,20 +15,40 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // Library General Public License for more details. // -// You should have received a copy of the GNU Library General Public -// License along with this library; if not, write to the -// Free Software Foundation, Inc., 59 Temple Place - Suite 330, -// Boston, MA 02111-1307, USA. +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // // $Id$ +#include + #include +#include #include - +#include +#include +#if defined( _MSC_VER) || defined(__MINGW32__) +# include +#endif #include "sg_path.hxx" +/** + * define directory path separators + */ + +static const char sgDirPathSep = '/'; +static const char sgDirPathSepBad = '\\'; + +#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 // ":" it should go without saying that neither of these characters // should be used in file or directory names. In windoze, allow the @@ -44,8 +64,8 @@ SGPath::fix() continue; } #endif - if ( path[i] == SG_BAD_PATH_SEP ) { - path[i] = SG_PATH_SEP; + if ( path[i] == sgDirPathSepBad ) { + path[i] = sgDirPathSep; } } } @@ -83,14 +103,19 @@ void SGPath::append( const string& p ) { if ( path.size() == 0 ) { path = p; } else { - if ( p[0] != SG_PATH_SEP ) { - path += SG_PATH_SEP; + if ( p[0] != sgDirPathSep ) { + path += sgDirPathSep; } path += 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 @@ -106,7 +131,7 @@ void SGPath::concat( const string& p ) { // Get the file part of the path (everything after the last path sep) string SGPath::file() const { - int index = path.rfind(SG_PATH_SEP); + int index = path.rfind(sgDirPathSep); if (index >= 0) { return path.substr(index + 1); } else { @@ -117,7 +142,7 @@ string SGPath::file() const { // get the directory part of the path. string SGPath::dir() const { - int index = path.rfind(SG_PATH_SEP); + int index = path.rfind(sgDirPathSep); if (index >= 0) { return path.substr(0, index); } else { @@ -128,17 +153,19 @@ 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 ""; } } -// get the extention (everything after the final ".") +// get the extension (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 ""; @@ -153,3 +180,91 @@ bool SGPath::exists() const { fclose(fp); return true; } + +#if defined( _MSC_VER) || defined(__MINGW32__) +# define sgMkDir(d,m) _mkdir(d) +#else +# define sgMkDir(d,m) mkdir(d,m) +#endif + + +int SGPath::create_dir( mode_t mode ) { + string_list dirlist = sgPathSplit(dir()); + if ( dirlist.empty() ) + return -1; + string path = dirlist[0]; + string_list path_elements = sgPathBranchSplit(path); + bool absolute = !path.empty() && path[0] == sgDirPathSep; + + unsigned int i = 1; + SGPath dir = absolute ? string( 1, sgDirPathSep ) : ""; + dir.concat( path_elements[0] ); +#if defined( _MSC_VER) || defined(__MINGW32__) + if ( dir.str().find(':') != string::npos && path_elements.size() >= 2 ) { + dir.append( path_elements[1] ); + i = 2; + } +#endif + struct stat info; + int r; + for(; ( r = stat( dir.c_str(), &info ) ) == 0 && i < path_elements.size(); i++) { + dir.append(path_elements[i]); + } + if ( r == 0 ) { + return 0; // Directory already exists + } + if ( sgMkDir( dir.c_str(), mode) ) { + SG_LOG( SG_IO, SG_ALERT, "Error creating directory: " + dir.str() ); + return -2; + } + for(; i < path_elements.size(); i++) { + dir.append(path_elements[i]); + if ( sgMkDir( dir.c_str(), mode) ) { + SG_LOG( SG_IO, SG_ALERT, "Error creating directory: " + dir.str() ); + return -2; + } + } + + return 0; +} + +string_list sgPathBranchSplit( const string &dirpath ) { + string_list path_elements; + string element, path = dirpath; + while ( path.size() ) { + size_t p = path.find( sgDirPathSep ); + if ( p != string::npos ) { + element = path.substr( 0, p ); + path.erase( 0, p + 1 ); + } else { + element = path; + path = ""; + } + if ( element.size() ) + path_elements.push_back( element ); + } + return path_elements; +} + + +string_list sgPathSplit( const string &search_path ) { + string tmp = search_path; + string_list result; + result.clear(); + + bool done = false; + + while ( !done ) { + int index = tmp.find(sgSearchPathSep); + if (index >= 0) { + result.push_back( tmp.substr(0, index) ); + tmp = tmp.substr( index + 1 ); + } else { + if ( !tmp.empty() ) + result.push_back( tmp ); + done = true; + } + } + + return result; +}