Tidy up the autoconf/automake configuration a bit.

[simgear.git] / simgear / io / sg_file.cxx

diff --git a/simgear/io/sg_file.cxx b/simgear/io/sg_file.cxx
index 4707c3976da9e187b259c5dbeaf6abf9f778cdbf..79cec7b7328bcf6dd8662ea2aa92ce8e04391fdf 100644 (file)
--- a/simgear/io/sg_file.cxx
+++ b/simgear/io/sg_file.cxx
@@ -25,7 +25,7 @@
 
 #include STL_STRING
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(__MINGW32__)
 #  include <io.h>
 #endif
 
@@ -33,7 +33,7 @@
 
 #include "sg_file.hxx"
 
-FG_USING_STD(string);
+SG_USING_STD(string);
 
 
 SGFile::SGFile( const string &file) {
@@ -47,30 +47,26 @@ SGFile::~SGFile() {
 
 
 // open the file based on specified direction
-bool SGFile::open( SGProtocolDir dir ) {
-    if ( dir == SG_IO_OUT ) {
-#ifdef _MSC_VER
-       fp = _open( file_name.c_str(), O_WRONLY | O_CREAT | O_TRUNC,
-                       00666 );
-#else
-       fp = std::open( file_name.c_str(), O_WRONLY | O_CREAT | O_TRUNC,
-                       S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | 
-                       S_IROTH | S_IWOTH );
-#endif
-    } else if ( dir == SG_IO_IN ) {
-#ifdef _MSC_VER
-       fp = _open( file_name.c_str(), O_RDONLY );
+bool SGFile::open( const SGProtocolDir d ) {
+    set_dir( d );
+
+    if ( get_dir() == SG_IO_OUT ) {
+#if defined(_MSC_VER) || defined(__MINGW32__)
+        int mode = 00666;
 #else
-       fp = std::open( file_name.c_str(), O_RDONLY );
+        mode_t mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH;
 #endif
+       fp = ::open( file_name.c_str(), O_WRONLY | O_CREAT | O_TRUNC, mode );
+    } else if ( get_dir() == SG_IO_IN ) {
+       fp = ::open( file_name.c_str(), O_RDONLY );
     } else {
-       FG_LOG( FG_IO, FG_ALERT, 
+       SG_LOG( SG_IO, SG_ALERT, 
                "Error:  bidirection mode not available for files." );
        return false;
     }
 
     if ( fp == -1 ) {
-       FG_LOG( FG_IO, FG_ALERT, "Error opening file: " << file_name );
+       SG_LOG( SG_IO, SG_ALERT, "Error opening file: " << file_name );
        return false;
     }
 
@@ -81,13 +77,7 @@ bool SGFile::open( SGProtocolDir dir ) {
 // read a block of data of specified size
 int SGFile::read( char *buf, int length ) {
     // read a chunk
-#ifdef _MSC_VER
-    int result = _read( fp, buf, length );
-#else
-    int result = std::read( fp, buf, length );
-#endif
-
-    return result;
+    return ::read( fp, buf, length );
 }
 
 
@@ -97,11 +87,7 @@ int SGFile::readline( char *buf, int length ) {
     int pos = lseek( fp, 0, SEEK_CUR );
 
     // read a chunk
-#ifdef _MSC_VER
-    int result = _read( fp, buf, length );
-#else
-    int result = std::read( fp, buf, length );
-#endif
+    int result = ::read( fp, buf, length );
 
     // find the end of line and reset position
     int i;
@@ -121,14 +107,10 @@ int SGFile::readline( char *buf, int length ) {
 
 
 // write data to a file
-int SGFile::write( char *buf, int length ) {
-#ifdef _MSC_VER
-    int result = _write( fp, buf, length );
-#else
-    int result = std::write( fp, buf, length );
-#endif
+int SGFile::write( const char *buf, const int length ) {
+    int result = ::write( fp, buf, length );
     if ( result != length ) {
-       FG_LOG( FG_IO, FG_ALERT, "Error writing data: " << file_name );
+       SG_LOG( SG_IO, SG_ALERT, "Error writing data: " << file_name );
     }
 
     return result;
@@ -136,7 +118,7 @@ int SGFile::write( char *buf, int length ) {
 
 
 // write null terminated string to a file
-int SGFile::writestring( char *str ) {
+int SGFile::writestring( const char *str ) {
     int length = strlen( str );
     return write( str, length );
 }
@@ -144,11 +126,7 @@ int SGFile::writestring( char *str ) {
 
 // close the port
 bool SGFile::close() {
-#ifdef _MSC_VER
-    if ( _close( fp ) == -1 ) {
-#else
-    if ( std::close( fp ) == -1 ) {
-#endif
+    if ( ::close( fp ) == -1 ) {
        return false;
     }