X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fmisc%2Fsg_path.cxx;h=6055becd8810bcb81caca3f362677a2daa66ae7f;hb=2e71b64de1d937e2b7c34dd4a2365be455d0b82a;hp=4cfc3576578eff19677f7d2249d89c6797c4b9e4;hpb=dcb95d131bc6aef1abe25d1f415e309f06e52436;p=simgear.git diff --git a/simgear/misc/sg_path.cxx b/simgear/misc/sg_path.cxx index 4cfc3576..6055becd 100644 --- a/simgear/misc/sg_path.cxx +++ b/simgear/misc/sg_path.cxx @@ -39,13 +39,8 @@ * define directory path separators */ -#if defined( macintosh ) -static const char sgDirPathSep = ':'; -static const char sgDirPathSepBad = '/'; -#else static const char sgDirPathSep = '/'; static const char sgDirPathSepBad = '\\'; -#endif #if defined( WIN32 ) && !defined(__CYGWIN__) static const char sgSearchPathSep = ';'; @@ -165,7 +160,7 @@ string SGPath::base() const { } } -// 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 { @@ -193,8 +188,10 @@ bool SGPath::exists() const { #endif -void SGPath::create_dir( mode_t mode ) { +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; @@ -214,19 +211,21 @@ void SGPath::create_dir( mode_t mode ) { dir.append(path_elements[i]); } if ( r == 0 ) { - return; // Directory already exists + return 0; // Directory already exists } if ( sgMkDir( dir.c_str(), mode) ) { SG_LOG( SG_IO, SG_ALERT, "Error creating directory: " + dir.str() ); - return; + return -2; } - for(;i < path_elements.size(); i++) { + 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() ); - break; + return -2; } } + + return 0; } string_list sgPathBranchSplit( const string &dirpath ) {