compilation fixes for !wxUSE_FONTMAP

[wxWidgets.git] / src / common / file.cpp

diff --git a/src/common/file.cpp b/src/common/file.cpp
index 83d73611a03e34f8755dd4bd4a1294634ee2d491..e7834e082a39f0cb409f8b53b622bb7ff8d39e3e 100644 (file)
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -28,7 +28,7 @@
 #if wxUSE_FILE
 
 // standard
 #if wxUSE_FILE
 
 // standard

-#if defined(__WXMSW__) && !defined(__GNUWIN32__) && !defined(__WXWINE__)
+#if defined(__WXMSW__) && !defined(__GNUWIN32__) && !defined(__WXWINE__) && !defined(__WXMICROWIN__)

   #include  <io.h>
 
 #ifndef __SALFORDC__
   #include  <io.h>
 
 #ifndef __SALFORDC__


@@ -54,27 +54,39 @@
     #define   NOMCX
 #endif
 
     #define   NOMCX
 #endif
 

-    #include  <windows.h>     // for GetTempFileName

 #elif (defined(__UNIX__) || defined(__GNUWIN32__))
     #include  <unistd.h>
     #ifdef __GNUWIN32__
         #include <windows.h>
     #endif
 #elif (defined(__UNIX__) || defined(__GNUWIN32__))
     #include  <unistd.h>
     #ifdef __GNUWIN32__
         #include <windows.h>
     #endif

+#elif defined(__DOS__)
+    #if defined(__WATCOMC__)
+       #include <io.h>
+    #elif defined(__DJGPP__)
+       #include <io.h>
+       #include <unistd.h>
+       #include <stdio.h>
+    #else
+        #error  "Please specify the header with file functions declarations."
+    #endif

 #elif (defined(__WXPM__))
     #include <io.h>
 #elif (defined(__WXPM__))
     #include <io.h>

-    #include <direct.h>

     #define   W_OK        2
     #define   R_OK        4
 #elif (defined(__WXSTUBS__))
     // Have to ifdef this for different environments
     #include <io.h>
 #elif (defined(__WXMAC__))
     #define   W_OK        2
     #define   R_OK        4
 #elif (defined(__WXSTUBS__))
     // Have to ifdef this for different environments
     #include <io.h>
 #elif (defined(__WXMAC__))

+#if __MSL__ < 0x6000

     int access( const char *path, int mode ) { return 0 ; }
     int access( const char *path, int mode ) { return 0 ; }

+#else
+    int _access( const char *path, int mode ) { return 0 ; }
+#endif

     char* mktemp( char * path ) { return path ;}
     char* mktemp( char * path ) { return path ;}

-    #include  <unistd.h>
-    #include  <unix.h>
+    #include <stat.h>

     #define   W_OK        2
     #define   R_OK        4
     #define   W_OK        2
     #define   R_OK        4

+    #include  <unistd.h>

 #else
     #error  "Please specify the header with file functions declarations."
 #endif  //Win/UNIX
 #else
     #error  "Please specify the header with file functions declarations."
 #endif  //Win/UNIX


@@ -85,45 +97,19 @@
 #ifndef __MWERKS__
     #include  <sys/types.h>   // needed for stat
     #include  <sys/stat.h>    // stat
 #ifndef __MWERKS__
     #include  <sys/types.h>   // needed for stat
     #include  <sys/stat.h>    // stat

+#elif ( defined(__MWERKS__) && defined(__WXMSW__) )
+    #include  <sys/types.h>   // needed for stat
+    #include  <sys/stat.h>    // stat

 #endif
 
 #endif
 

-// Microsoft compiler loves underscores, feed them to it
-#ifdef  __VISUALC__
-    // functions
-    #define   open        _open
-    #define   close       _close
-    #define   read        _read
-    #define   write       _write
-    #define   lseek       _lseek
-    #define   fsync       _commit
-    #define   access      _access
-    #define   eof         _eof
-
-    // types
-    #define   stat        _stat
-
-    // constants
-
-    #define   O_RDONLY    _O_RDONLY
-    #define   O_WRONLY    _O_WRONLY
-    #define   O_RDWR      _O_RDWR
-    #define   O_EXCL      _O_EXCL
-    #define   O_CREAT     _O_CREAT
-    #define   O_BINARY    _O_BINARY
-
-    #define   S_IFDIR     _S_IFDIR
-    #define   S_IFREG     _S_IFREG
-#else
-    #define   tell(fd)    lseek(fd, 0, SEEK_CUR)
-#endif  // VC++
-

 #if defined(__BORLANDC__) || defined(_MSC_VER)
     #define   W_OK        2
     #define   R_OK        4
 #endif
 
 #if defined(__BORLANDC__) || defined(_MSC_VER)
     #define   W_OK        2
     #define   R_OK        4
 #endif
 

-// there is no distinction between text and binary files under Unix
-#ifdef    __UNIX__
+// there is no distinction between text and binary files under Unix, so define
+// O_BINARY as 0 if the system headers don't do it already
+#if defined(__UNIX__) && !defined(O_BINARY)

     #define   O_BINARY    (0)
 #endif  //__UNIX__
 
     #define   O_BINARY    (0)
 #endif  //__UNIX__
 


@@ -131,22 +117,10 @@
     #include <unix.h>
 #endif
 
     #include <unix.h>
 #endif
 

-// wxWindows
-#include  <wx/string.h>
-#include  <wx/intl.h>
-#include  <wx/file.h>
-#include  <wx/log.h>
-

 #ifndef MAX_PATH
     #define MAX_PATH 512
 #endif
 
 #ifndef MAX_PATH
     #define MAX_PATH 512
 #endif
 

-#ifdef __WXMAC__
-    char gwxMacFileName[ MAX_PATH ] ;
-    char gwxMacFileName2[ MAX_PATH ] ;
-    char gwxMacFileName3[ MAX_PATH ] ;
-#endif
-

 // some broken compilers don't have 3rd argument in open() and creat()
 #ifdef __SALFORDC__
     #define ACCESS(access)
 // some broken compilers don't have 3rd argument in open() and creat()
 #ifdef __SALFORDC__
     #define ACCESS(access)


@@ -155,6 +129,16 @@
     #define ACCESS(access)  , (access)
 #endif // Salford C
 
     #define ACCESS(access)  , (access)
 #endif // Salford C
 

+// wxWindows
+#ifndef WX_PRECOMP
+    #include  "wx/string.h"
+    #include  "wx/intl.h"
+    #include  "wx/log.h"
+#endif // !WX_PRECOMP
+
+#include  "wx/filename.h"
+#include  "wx/file.h"
+

 // ============================================================================
 // implementation of wxFile
 // ============================================================================
 // ============================================================================
 // implementation of wxFile
 // ============================================================================


@@ -164,16 +148,17 @@
 // ----------------------------------------------------------------------------
 bool wxFile::Exists(const wxChar *name)
 {
 // ----------------------------------------------------------------------------
 bool wxFile::Exists(const wxChar *name)
 {

-    struct stat st;
+    wxStructStat st;

 #if wxUSE_UNICODE && wxMBFILES
     wxCharBuffer fname = wxConvFile.cWC2MB(name);
 
 #if wxUSE_UNICODE && wxMBFILES
     wxCharBuffer fname = wxConvFile.cWC2MB(name);
 

-    return !access(fname, 0) &&
-           !stat(wxMBSTRINGCAST fname, &st) &&
+    return !wxAccess(fname, 0) &&
+           !wxStat(wxMBSTRINGCAST fname, &st) &&

            (st.st_mode & S_IFREG);
            (st.st_mode & S_IFREG);

+

 #else
 #else

-    return !access(name, 0) &&
-           !stat((wxChar*) name, &st) &&
+    return !wxAccess(name, 0) &&
+           !wxStat(name, &st) &&

            (st.st_mode & S_IFREG);
 #endif
 }
            (st.st_mode & S_IFREG);
 #endif
 }


@@ -192,10 +177,10 @@ bool wxFile::Access(const wxChar *name, OpenMode mode)
             break;
 
         default:
             break;
 
         default:

-            wxFAIL_MSG(T("bad wxFile::Access mode parameter."));
+            wxFAIL_MSG(wxT("bad wxFile::Access mode parameter."));

     }
 
     }
 

-    return access(wxFNCONV(name), how) == 0;
+    return wxAccess(wxFNCONV(name), how) == 0;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -216,10 +201,16 @@ bool wxFile::Create(const wxChar *szFileName, bool bOverwrite, int accessMode)
 {
     // if bOverwrite we create a new file or truncate the existing one,
     // otherwise we only create the new file and fail if it already exists
 {
     // if bOverwrite we create a new file or truncate the existing one,
     // otherwise we only create the new file and fail if it already exists

-    int fd = open(wxFNCONV(szFileName),
-                  O_WRONLY | O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL)
-                  ACCESS(accessMode));
-
+#if defined(__WXMAC__) && !defined(__UNIX__)
+  // Dominic Mazzoni [dmazzoni+@cs.cmu.edu] reports that open is still broken on the mac, so we replace
+  // int fd = open(wxUnix2MacFilename( szFileName ), O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL), access);
+  int fd = creat( szFileName , accessMode);
+#else
+    int fd = wxOpen(wxFNCONV(szFileName),
+                    O_BINARY | O_WRONLY | O_CREAT |
+                    (bOverwrite ? O_TRUNC : O_EXCL)
+                    ACCESS(accessMode));
+#endif

     if ( fd == -1 ) {
         wxLogSysError(_("can't create file '%s'"), szFileName);
         return FALSE;
     if ( fd == -1 ) {
         wxLogSysError(_("can't create file '%s'"), szFileName);
         return FALSE;


@@ -240,12 +231,21 @@ bool wxFile::Open(const wxChar *szFileName, OpenMode mode, int accessMode)
             flags |= O_RDONLY;
             break;
 
             flags |= O_RDONLY;
             break;
 

+        case write_append:
+            if ( wxFile::Exists(szFileName) )
+            {
+                flags |= O_WRONLY | O_APPEND;
+                break;
+            }
+            //else: fall through as write_append is the same as write if the
+            //      file doesn't exist
+

         case write:
             flags |= O_WRONLY | O_CREAT | O_TRUNC;
             break;
 
         case write:
             flags |= O_WRONLY | O_CREAT | O_TRUNC;
             break;
 

-        case write_append:
-            flags |= O_WRONLY | O_APPEND;
+        case write_excl:
+            flags |= O_WRONLY | O_CREAT | O_EXCL;

             break;
 
         case read_write:
             break;
 
         case read_write:


@@ -253,8 +253,7 @@ bool wxFile::Open(const wxChar *szFileName, OpenMode mode, int accessMode)
             break;
     }
 
             break;
     }
 

-    int fd = open(wxFNCONV(szFileName), flags ACCESS(accessMode));
-
+    int fd = wxOpen(wxFNCONV(szFileName), flags ACCESS(accessMode));

     if ( fd == -1 ) {
         wxLogSysError(_("can't open file '%s'"), szFileName);
         return FALSE;
     if ( fd == -1 ) {
         wxLogSysError(_("can't open file '%s'"), szFileName);
         return FALSE;


@@ -309,7 +308,11 @@ size_t wxFile::Write(const void *pBuf, size_t nCount)
     wxCHECK( (pBuf != NULL) && IsOpened(), 0 );
 
 #ifdef __MWERKS__
     wxCHECK( (pBuf != NULL) && IsOpened(), 0 );
 
 #ifdef __MWERKS__

+#if __MSL__ >= 0x6000
+    int iRc = ::write(m_fd, (void*) pBuf, nCount);
+#else

     int iRc = ::write(m_fd, (const char*) pBuf, nCount);
     int iRc = ::write(m_fd, (const char*) pBuf, nCount);

+#endif

 #else
     int iRc = ::write(m_fd, pBuf, nCount);
 #endif
 #else
     int iRc = ::write(m_fd, pBuf, nCount);
 #endif


@@ -327,7 +330,7 @@ bool wxFile::Flush()
 {
     if ( IsOpened() ) {
 #if defined(__VISUALC__) || wxHAVE_FSYNC
 {
     if ( IsOpened() ) {
 #if defined(__VISUALC__) || wxHAVE_FSYNC

-        if ( fsync(m_fd) == -1 )
+        if ( wxFsync(m_fd) == -1 )

         {
             wxLogSysError(_("can't flush file descriptor %d"), m_fd);
             return FALSE;
         {
             wxLogSysError(_("can't flush file descriptor %d"), m_fd);
             return FALSE;


@@ -381,7 +384,7 @@ off_t wxFile::Tell() const
 {
     wxASSERT( IsOpened() );
 
 {
     wxASSERT( IsOpened() );
 

-    int iRc = tell(m_fd);
+    int iRc = wxTell(m_fd);

     if ( iRc == -1 ) {
         wxLogSysError(_("can't get seek position on file descriptor %d"), m_fd);
         return wxInvalidOffset;
     if ( iRc == -1 ) {
         wxLogSysError(_("can't get seek position on file descriptor %d"), m_fd);
         return wxInvalidOffset;


@@ -398,7 +401,7 @@ off_t wxFile::Length() const
 #ifdef __VISUALC__
     int iRc = _filelength(m_fd);
 #else // !VC++
 #ifdef __VISUALC__
     int iRc = _filelength(m_fd);
 #else // !VC++

-    int iRc = tell(m_fd);
+    int iRc = wxTell(m_fd);

     if ( iRc != -1 ) {
         // @ have to use const_cast :-(
         int iLen = ((wxFile *)this)->SeekEnd();
     if ( iRc != -1 ) {
         // @ have to use const_cast :-(
         int iLen = ((wxFile *)this)->SeekEnd();


@@ -429,7 +432,7 @@ bool wxFile::Eof() const
 
     int iRc;
 
 
     int iRc;
 

-#if defined(__UNIX__) || defined(__GNUWIN32__) || defined( __MWERKS__ ) || defined(__SALFORDC__)
+#if defined(__DOS__) || defined(__UNIX__) || defined(__GNUWIN32__) || defined( __MWERKS__ ) || defined(__SALFORDC__)

     // @@ this doesn't work, of course, on unseekable file descriptors
     off_t ofsCur = Tell(),
     ofsMax = Length();
     // @@ this doesn't work, of course, on unseekable file descriptors
     off_t ofsCur = Tell(),
     ofsMax = Length();


@@ -449,8 +452,7 @@ bool wxFile::Eof() const
             return FALSE;
 
         case -1:
             return FALSE;
 
         case -1:

-            wxLogSysError(_("can't determine if the end of file is reached on \
-                descriptor %d"), m_fd);
+            wxLogSysError(_("can't determine if the end of file is reached on descriptor %d"), m_fd);

                 break;
 
         default:
                 break;
 
         default:


@@ -476,76 +478,39 @@ bool wxTempFile::Open(const wxString& strName)
 {
     m_strName = strName;
 
 {
     m_strName = strName;
 

-    // we want to create the file in the same directory as strName because
-    // otherwise rename() in Commit() might not work (if the files are on
-    // different partitions for example). Unfortunately, the only standard
-    // (POSIX) temp file creation function tmpnam() can't do it.
-#if defined(__UNIX__) || defined(__WXSTUBS__)|| defined( __WXMAC__ )
-    static const wxChar *szMktempSuffix = T("XXXXXX");
-    m_strTemp << strName << szMktempSuffix;
-    // can use the cast because length doesn't change
-    mktemp(wxMBSTRINGCAST m_strTemp.mb_str());
-#elif  defined(__WXPM__)
-    // for now just create a file
-    // future enhancements can be to set some extended attributes for file systems
-    // OS/2 supports that have them (HPFS, FAT32) and security (HPFS386)
-    static const wxChar *szMktempSuffix = T("XXX");
-    m_strTemp << strName << szMktempSuffix;
-    mkdir(m_strTemp.GetWriteBuf(MAX_PATH));
-#else // Windows
-    wxString strPath;
-    wxSplitPath(strName, &strPath, NULL, NULL);
-    if ( strPath.IsEmpty() )
-        strPath = T('.');  // GetTempFileName will fail if we give it empty string
-#ifdef __WIN32__
-    if ( !GetTempFileName(strPath, T("wx_"),0, m_strTemp.GetWriteBuf(MAX_PATH)) )
-#else
-        // Not sure why MSVC++ 1.5 header defines first param as BYTE - bug?
-        if ( !GetTempFileName((BYTE) (DWORD)(const wxChar*) strPath, T("wx_"),0, m_strTemp.GetWriteBuf(MAX_PATH)) )
-#endif
-            wxLogLastError(T("GetTempFileName"));
-    m_strTemp.UngetWriteBuf();
-#endif  // Windows/Unix
+    m_strTemp = wxFileName::CreateTempFileName(strName, &m_file);
+
+    if ( m_strTemp.empty() )
+    {
+        // CreateTempFileName() failed
+        return FALSE;
+    }

 
 

-    int access = wxS_DEFAULT;

 #ifdef __UNIX__
 #ifdef __UNIX__

-    // create the file with the same mode as the original one under Unix
-    mode_t umaskOld = 0; // just to suppress compiler warning
-    bool changedUmask;
+    // the temp file should have the same permissions as the original one
+    mode_t mode;

 
 

-    struct stat st;
+    wxStructStat st;

     if ( stat(strName.fn_str(), &st) == 0 )
     {
     if ( stat(strName.fn_str(), &st) == 0 )
     {

-        // this assumes that only lower bits of st_mode contain the access
-        // rights, but it's true for at least all Unices which have S_IXXXX()
-        // macros, so should not be less portable than using (not POSIX)
-        // S_IFREG &c
-        access = st.st_mode & 0777;
-
-        // we want to create the file with exactly the same access rights as
-        // the original one, so disable the user's umask for the moment
-        umaskOld = umask(0);
-        changedUmask = TRUE;
+        mode = st.st_mode;

     }
     else
     {
     }
     else
     {

-        // file probably didn't exist, just create with default mode _using_
-        // user's umask (new files creation should respet umask)
-        changedUmask = FALSE;
+        // file probably didn't exist, just give it the default mode _using_
+        // user's umask (new files creation should respect umask)
+        mode_t mask = umask(0777);
+        mode = 0666 & ~mask;
+        umask(mask);

     }
     }

-#endif // Unix
-
-    bool ok = m_file.Open(m_strTemp, wxFile::write, access);

 
 

-#ifdef __UNIX__
-    if ( changedUmask )
+    if ( chmod(m_strTemp.mb_str(), mode) == -1 )

     {
     {

-        // restore umask now that the file is created
-        (void)umask(umaskOld);
+        wxLogSysError(_("Failed to set temporary file permissions"));

     }
 #endif // Unix
 
     }
 #endif // Unix
 

-    return ok;
+    return TRUE;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -562,12 +527,12 @@ bool wxTempFile::Commit()
 {
     m_file.Close();
 
 {
     m_file.Close();
 

-    if ( wxFile::Exists(m_strName) && remove(m_strName.fn_str()) != 0 ) {
+    if ( wxFile::Exists(m_strName) && wxRemove(m_strName) != 0 ) {

         wxLogSysError(_("can't remove file '%s'"), m_strName.c_str());
         return FALSE;
     }
 
         wxLogSysError(_("can't remove file '%s'"), m_strName.c_str());
         return FALSE;
     }
 

-    if ( rename(m_strTemp.fn_str(), m_strName.fn_str()) != 0 ) {
+    if ( wxRename(m_strTemp, m_strName) != 0 ) {

         wxLogSysError(_("can't commit changes to file '%s'"), m_strName.c_str());
         return FALSE;
     }
         wxLogSysError(_("can't commit changes to file '%s'"), m_strName.c_str());
         return FALSE;
     }


@@ -578,9 +543,9 @@ bool wxTempFile::Commit()
 void wxTempFile::Discard()
 {
     m_file.Close();
 void wxTempFile::Discard()
 {
     m_file.Close();

-    if ( remove(m_strTemp.fn_str()) != 0 )
+    if ( wxRemove(m_strTemp) != 0 )

         wxLogSysError(_("can't remove temporary file '%s'"), m_strTemp.c_str());
 }
 
         wxLogSysError(_("can't remove temporary file '%s'"), m_strTemp.c_str());
 }
 

-#endif
+#endif // wxUSE_FILE