X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fmisc%2Fsg_path.cxx;h=6055becd8810bcb81caca3f362677a2daa66ae7f;hb=2e71b64de1d937e2b7c34dd4a2365be455d0b82a;hp=54f7138dbcde9167cb979b3a93a74a769107c340;hpb=7fc8c026884b2d0a1b683765c089a9bef5ac47c8;p=simgear.git diff --git a/simgear/misc/sg_path.cxx b/simgear/misc/sg_path.cxx index 54f7138d..6055becd 100644 --- a/simgear/misc/sg_path.cxx +++ b/simgear/misc/sg_path.cxx @@ -15,10 +15,9 @@ // 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$ @@ -26,8 +25,13 @@ #include #include +#include #include - +#include +#include +#if defined( _MSC_VER) || defined(__MINGW32__) +# include +#endif #include "sg_path.hxx" @@ -35,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 = ';'; @@ -161,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 { @@ -182,6 +181,71 @@ bool SGPath::exists() const { 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;