// 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 <simgear/debug/logstream.hxx>
#include <stdio.h>
#include <sys/stat.h>
-#include <sys/stat.h>
-#if defined( _MSC_VER) || defined(__MINGW32__)
+#ifdef _WIN32
# include <direct.h>
#endif
#include "sg_path.hxx"
* 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__)
+#ifdef _WIN32
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
+// If Unix, replace all ":" with "/". In windoze, allow the
// second character to be a ":" for things like c:\foo\bar
void
}
}
-// 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 {
}
}
-bool SGPath::exists() const {
- FILE* fp = fopen( path.c_str(), "r");
- if (fp == 0) {
- return false;
- }
- fclose(fp);
- return true;
+bool SGPath::exists() const
+{
+#ifdef _WIN32
+ struct _stat buf;
+
+ if (_stat(path.c_str(), &buf) < 0) {
+ return false;
+ }
+
+ return true;
+#else
+ struct stat buf ;
+
+ if (stat(path.c_str(), &buf) < 0) {
+ return false ;
+ }
+
+ return true;
+#endif
}
-#if defined( _MSC_VER) || defined(__MINGW32__)
+#ifdef _WIN32
# define sgMkDir(d,m) _mkdir(d)
#else
# define sgMkDir(d,m) mkdir(d,m)
#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;
- int i = 1;
+ unsigned int i = 1;
SGPath dir = absolute ? string( 1, sgDirPathSep ) : "";
dir.concat( path_elements[0] );
-#if defined( _MSC_VER) || defined(__MINGW32__)
+#ifdef _WIN32
if ( dir.str().find(':') != string::npos && path_elements.size() >= 2 ) {
dir.append( path_elements[1] );
i = 2;
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 ) {