BIG glitch.

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

diff --git a/src/common/file.cpp b/src/common/file.cpp
index 30bc2d13d7e1e96dfc6ab2617ae8479b48f8b8d7..5cf0152d8ac427d624a16b95cea7718b005b2930 100644 (file)
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -15,7 +15,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__

-#pragma implementation "file.h"
+    #pragma implementation "file.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".


@@ -23,105 +23,108 @@
 #include "wx/defs.h"
 
 #ifdef __BORLANDC__
 #include "wx/defs.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 // standard
 #if   defined(__WXMSW__) && !defined(__GNUWIN32__)
   #include  <io.h>
 
 #endif
 
 // standard
 #if   defined(__WXMSW__) && !defined(__GNUWIN32__)
   #include  <io.h>
 

-  #define   WIN32_LEAN_AND_MEAN
-  #define   NOSERVICE
-  #define   NOIME
-  #define   NOATOM
-  #define   NOGDI
-  #define   NOGDICAPMASKS
-  #define   NOMETAFILE
-  #define   NOMINMAX
-  #define   NOMSG
-  #define   NOOPENFILE
-  #define   NORASTEROPS
-  #define   NOSCROLL
-  #define   NOSOUND
-  #define   NOSYSMETRICS
-  #define   NOTEXTMETRIC
-  #define   NOWH
-  #define   NOCOMM
-  #define   NOKANJI
-  #define   NOCRYPT
-  #define   NOMCX
-  #include  <windows.h>     // for GetTempFileName
+#ifndef __SALFORDC__
+    #define   WIN32_LEAN_AND_MEAN
+    #define   NOSERVICE
+    #define   NOIME
+    #define   NOATOM
+    #define   NOGDI
+    #define   NOGDICAPMASKS
+    #define   NOMETAFILE
+    #define   NOMINMAX
+    #define   NOMSG
+    #define   NOOPENFILE
+    #define   NORASTEROPS
+    #define   NOSCROLL
+    #define   NOSOUND
+    #define   NOSYSMETRICS
+    #define   NOTEXTMETRIC
+    #define   NOWH
+    #define   NOCOMM
+    #define   NOKANJI
+    #define   NOCRYPT
+    #define   NOMCX
+#endif
+
+    #include  <windows.h>     // for GetTempFileName

 #elif (defined(__UNIX__) || defined(__GNUWIN32__))
 #elif (defined(__UNIX__) || defined(__GNUWIN32__))

-  #include  <unistd.h>
+    #include  <unistd.h>
+    #ifdef __GNUWIN32__
+        #include <windows.h>
+    #endif

 #elif (defined(__WXSTUBS__))
 #elif (defined(__WXSTUBS__))

-  // Have to ifdef this for different environments
-  #include <io.h>
+    // Have to ifdef this for different environments
+    #include <io.h>

 #elif (defined(__WXMAC__))
 #elif (defined(__WXMAC__))

-  int access( const char *path, int mode ) { return 0 ; }
-  char* mktemp( char * path ) { return path ;}
-  #include  <unistd.h>
-  #include  <unix.h>
-  #define   W_OK        2
-  #define   R_OK        4
+    int access( const char *path, int mode ) { return 0 ; }
+    char* mktemp( char * path ) { return path ;}
+    #include  <unistd.h>
+    #include  <unix.h>
+    #define   W_OK        2
+    #define   R_OK        4

 #else
 #else

-  #error  "Please specify the header with file functions declarations."
+    #error  "Please specify the header with file functions declarations."

 #endif  //Win/UNIX
 
 #include  <stdio.h>       // SEEK_xxx constants
 #include  <fcntl.h>       // O_RDONLY &c
 #endif  //Win/UNIX
 
 #include  <stdio.h>       // SEEK_xxx constants
 #include  <fcntl.h>       // O_RDONLY &c

+

 #ifndef __MWERKS__
 #ifndef __MWERKS__

-#include  <sys/types.h>   // needed for stat
-#include  <sys/stat.h>    // stat
+    #include  <sys/types.h>   // needed for stat
+    #include  <sys/stat.h>    // stat

 #endif
 
 // Microsoft compiler loves underscores, feed them to it
 #endif
 
 // Microsoft compiler loves underscores, feed them to it

-#ifdef    _MSC_VER
-
-  #ifndef __MWERKS__
-
-  // 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
-  
-  #endif
-
-  #define   W_OK        2
-  #define   R_OK        4
+#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
 #else

-  #define   tell(fd)    lseek(fd, 0, SEEK_CUR)
-#endif  //_MSC_VER
+    #define   tell(fd)    lseek(fd, 0, SEEK_CUR)
+#endif  // VC++

 
 

-#ifdef __BORLANDC__
-  #define   W_OK        2
-  #define   R_OK        4
+#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__
 #endif
 
 // there is no distinction between text and binary files under Unix
 #ifdef    __UNIX__

-  #define   O_BINARY    (0)
+    #define   O_BINARY    (0)

 #endif  //__UNIX__
 
 #endif  //__UNIX__
 

+#ifdef __SALFORDC__
+    #include <unix.h>
+#endif
+

 // wxWindows
 #include  <wx/string.h>
 #include  <wx/intl.h>
 // wxWindows
 #include  <wx/string.h>
 #include  <wx/intl.h>


@@ -129,9 +132,23 @@
 #include  <wx/log.h>
 
 #ifndef MAX_PATH
 #include  <wx/log.h>
 
 #ifndef MAX_PATH

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

 #endif
 
 #endif
 

+// some broken compilers don't have 3rd argument in open() and creat()
+#ifdef __SALFORDC__
+    #define ACCESS(access)
+    #define stat    _stat
+#else // normal compiler
+    #define ACCESS(access)  , (access)
+#endif // Salford C
+

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


@@ -139,30 +156,40 @@
 // ----------------------------------------------------------------------------
 // static functions
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // static functions
 // ----------------------------------------------------------------------------

-bool wxFile::Exists(const char *name)
+bool wxFile::Exists(const wxChar *name)

 {
 {

-  struct stat st;
-  return !access(name, 0) && !stat(name, &st) && (st.st_mode & S_IFREG);
+    struct stat st;
+#if wxUSE_UNICODE && wxMBFILES
+    wxCharBuffer fname = wxConv_file.cWC2MB(name);
+
+    return !access(fname, 0) &&
+           !stat(MBSTRINGCAST fname, &st) &&
+           (st.st_mode & S_IFREG);
+#else
+    return !access(name, 0) &&
+           !stat((wxChar*) name, &st) &&
+           (st.st_mode & S_IFREG);
+#endif

 }
 
 }
 

-bool wxFile::Access(const char *name, OpenMode mode)
+bool wxFile::Access(const wxChar *name, OpenMode mode)

 {
 {

-  int how = 0;
+    int how = 0;

 
 

-  switch ( mode ) {
-    case read:
-      how = R_OK;
-      break;
+    switch ( mode ) {
+        case read:
+            how = R_OK;
+            break;

 
 

-    case write:
-      how = W_OK;
-      break;
+        case write:
+            how = W_OK;
+            break;

 
 

-    default:
-      wxFAIL_MSG("bad wxFile::Access mode parameter.");
-  }
+        default:
+            wxFAIL_MSG(_T("bad wxFile::Access mode parameter."));
+    }

 
 

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

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


@@ -170,87 +197,88 @@ bool wxFile::Access(const char *name, OpenMode mode)
 // ----------------------------------------------------------------------------
 
 // ctors
 // ----------------------------------------------------------------------------
 
 // ctors

-wxFile::wxFile(const char *szFileName, OpenMode mode)
+wxFile::wxFile(const wxChar *szFileName, OpenMode mode)

 {
 {

-  m_fd = fd_invalid;
-  m_error = FALSE;
+    m_fd = fd_invalid;
+    m_error = FALSE;

 
 

-  Open(szFileName, mode);
+    Open(szFileName, mode);

 }
 
 // dtor
 wxFile::~wxFile()
 {
 }
 
 // dtor
 wxFile::~wxFile()
 {

-  Close();
+    Close();

 }
 
 // create the file, fail if it already exists and bOverwrite
 }
 
 // create the file, fail if it already exists and bOverwrite

-bool wxFile::Create(const char *szFileName, bool bOverwrite, int access)
+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
-  int fd = open(szFileName, O_WRONLY | O_CREAT | 
-                (bOverwrite ? O_TRUNC : O_EXCL), access);
-
-  if ( fd == -1 ) {
-    wxLogSysError(_("can't create file '%s'"), szFileName);
-    return FALSE;
-  }
-  else {
-    Attach(fd);
-    return TRUE;
-  }
+    // 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 ( fd == -1 ) {
+        wxLogSysError(_("can't create file '%s'"), szFileName);
+        return FALSE;
+    }
+    else {
+        Attach(fd);
+        return TRUE;
+    }

 }
 
 // open the file
 }
 
 // open the file

-bool wxFile::Open(const char *szFileName, OpenMode mode, int access)
+bool wxFile::Open(const wxChar *szFileName, OpenMode mode, int accessMode)

 {
 {

-  int flags = O_BINARY;
-
-  switch ( mode ) {
-    case read:
-      flags |= O_RDONLY;
-      break;
-
-    case write:
-      flags |= O_WRONLY | O_CREAT | O_TRUNC;
-      break;
-
-    case write_append:
-      flags |= O_WRONLY | O_APPEND;
-      break;
-
-    case read_write:
-      flags |= O_RDWR;
-      break;
-  }
-
-  int fd = open(szFileName, flags, access);
-
-  if ( fd == -1 ) {
-    wxLogSysError(_("can't open file '%s'"), szFileName);
-    return FALSE;
-  }
-  else {
-    Attach(fd);
-    return TRUE;
-  }
+    int flags = O_BINARY;
+
+    switch ( mode ) {
+        case read:
+            flags |= O_RDONLY;
+            break;
+
+        case write:
+            flags |= O_WRONLY | O_CREAT | O_TRUNC;
+            break;
+
+        case write_append:
+            flags |= O_WRONLY | O_APPEND;
+            break;
+
+        case read_write:
+            flags |= O_RDWR;
+            break;
+    }
+
+    int fd = open(wxFNCONV(szFileName), flags ACCESS(accessMode));
+
+    if ( fd == -1 ) {
+        wxLogSysError(_("can't open file '%s'"), szFileName);
+        return FALSE;
+    }
+    else {
+        Attach(fd);
+        return TRUE;
+    }

 }
 
 // close
 bool wxFile::Close()
 {
 }
 
 // close
 bool wxFile::Close()
 {

-  if ( IsOpened() ) {
-    if ( close(m_fd) == -1 ) {
-      wxLogSysError(_("can't close file descriptor %d"), m_fd);
-      m_fd = fd_invalid;
-      return FALSE;
+    if ( IsOpened() ) {
+        if ( close(m_fd) == -1 ) {
+            wxLogSysError(_("can't close file descriptor %d"), m_fd);
+            m_fd = fd_invalid;
+            return FALSE;
+        }
+        else
+            m_fd = fd_invalid;

     }
     }

-    else
-      m_fd = fd_invalid;
-  }

 
 

-  return TRUE;
+    return TRUE;

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


@@ -260,53 +288,56 @@ bool wxFile::Close()
 // read
 off_t wxFile::Read(void *pBuf, off_t nCount)
 {
 // read
 off_t wxFile::Read(void *pBuf, off_t nCount)
 {

-  wxCHECK( (pBuf != NULL) && IsOpened(), 0 );
+    wxCHECK( (pBuf != NULL) && IsOpened(), 0 );

 
 #ifdef __MWERKS__
 
 #ifdef __MWERKS__

-  int iRc = ::read(m_fd, (char*) pBuf, nCount);
+    int iRc = ::read(m_fd, (char*) pBuf, nCount);

 #else
 #else

-  int iRc = ::read(m_fd, pBuf, nCount);
+    int iRc = ::read(m_fd, pBuf, nCount);

 #endif
 #endif

-  if ( iRc == -1 ) {
-    wxLogSysError(_("can't read from file descriptor %d"), m_fd);
-    return wxInvalidOffset;
-  }
-  else
-    return (size_t)iRc;
+    if ( iRc == -1 ) {
+        wxLogSysError(_("can't read from file descriptor %d"), m_fd);
+        return wxInvalidOffset;
+    }
+    else
+        return (size_t)iRc;

 }
 
 // write
 size_t wxFile::Write(const void *pBuf, size_t nCount)
 {
 }
 
 // write
 size_t wxFile::Write(const void *pBuf, size_t nCount)
 {

-  wxCHECK( (pBuf != NULL) && IsOpened(), 0 );
+    wxCHECK( (pBuf != NULL) && IsOpened(), 0 );

 
 #ifdef __MWERKS__
 
 #ifdef __MWERKS__

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

 #else
 #else

-  int iRc = ::write(m_fd, pBuf, nCount);
+    int iRc = ::write(m_fd, pBuf, nCount);

 #endif
 #endif

-  if ( iRc == -1 ) {
-    wxLogSysError(_("can't write to file descriptor %d"), m_fd);
-    m_error = TRUE;
-    return 0;
-  }
-  else
-    return iRc;
+    if ( iRc == -1 ) {
+        wxLogSysError(_("can't write to file descriptor %d"), m_fd);
+        m_error = TRUE;
+        return 0;
+    }
+    else
+        return iRc;

 }
 
 // flush
 bool wxFile::Flush()
 {
 }
 
 // flush
 bool wxFile::Flush()
 {

-  if ( IsOpened() ) {
-               // @@@ fsync() is not ANSI (BSDish)
-//    if ( fsync(m_fd) == -1 ) { // TODO
-      if (wxTrue) {
-      wxLogSysError(_("can't flush file descriptor %d"), m_fd);
-      return FALSE;
+    if ( IsOpened() ) {
+#if defined(__VISUALC__) || wxHAVE_FSYNC
+        if ( fsync(m_fd) == -1 )
+        {
+            wxLogSysError(_("can't flush file descriptor %d"), m_fd);
+            return FALSE;
+        }
+#else // no fsync
+        // just do nothing
+#endif // fsync

     }
     }

-  }

 
 

-  return TRUE;
+    return TRUE;

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


@@ -316,118 +347,117 @@ bool wxFile::Flush()
 // seek
 off_t wxFile::Seek(off_t ofs, wxSeekMode mode)
 {
 // seek
 off_t wxFile::Seek(off_t ofs, wxSeekMode mode)
 {

-  wxASSERT( IsOpened() );
-
-  int flag = -1;
-  switch ( mode ) {
-    case wxFromStart:
-      flag = SEEK_SET;
-      break;
-
-    case wxFromCurrent:
-      flag = SEEK_CUR;
-      break;
-
-    case wxFromEnd:
-      flag = SEEK_END;
-      break;
-
-    default:
-      wxFAIL_MSG(_("unknown seek origin"));
-  }
-
-  int iRc = lseek(m_fd, ofs, flag);
-  if ( iRc == -1 ) {
-    wxLogSysError(_("can't seek on file descriptor %d"), m_fd);
-    return wxInvalidOffset;
-  }
-  else
-    return (off_t)iRc;
+    wxASSERT( IsOpened() );
+
+    int flag = -1;
+    switch ( mode ) {
+        case wxFromStart:
+            flag = SEEK_SET;
+            break;
+
+        case wxFromCurrent:
+            flag = SEEK_CUR;
+            break;
+
+        case wxFromEnd:
+            flag = SEEK_END;
+            break;
+
+        default:
+            wxFAIL_MSG(_("unknown seek origin"));
+    }
+
+    int iRc = lseek(m_fd, ofs, flag);
+    if ( iRc == -1 ) {
+        wxLogSysError(_("can't seek on file descriptor %d"), m_fd);
+        return wxInvalidOffset;
+    }
+    else
+        return (off_t)iRc;

 }
 
 // get current off_t
 off_t wxFile::Tell() const
 {
 }
 
 // get current off_t
 off_t wxFile::Tell() const
 {

-  wxASSERT( IsOpened() );
-
-  int iRc = tell(m_fd);
-  if ( iRc == -1 ) {
-    wxLogSysError(_("can't get seek position on file descriptor %d"), m_fd);
-    return wxInvalidOffset;
-  }
-  else
-    return (off_t)iRc;
+    wxASSERT( IsOpened() );
+
+    int iRc = tell(m_fd);
+    if ( iRc == -1 ) {
+        wxLogSysError(_("can't get seek position on file descriptor %d"), m_fd);
+        return wxInvalidOffset;
+    }
+    else
+        return (off_t)iRc;

 }
 
 // get current file length
 off_t wxFile::Length() const
 {
 }
 
 // get current file length
 off_t wxFile::Length() const
 {

-  wxASSERT( IsOpened() );
+    wxASSERT( IsOpened() );

 
 

-  #if defined(  _MSC_VER ) && !defined( __MWERKS__ )
+#ifdef __VISUALC__

     int iRc = _filelength(m_fd);
     int iRc = _filelength(m_fd);

-  #else
+#else // !VC++

     int iRc = tell(m_fd);
     if ( iRc != -1 ) {
     int iRc = tell(m_fd);
     if ( iRc != -1 ) {

-      // @ have to use const_cast :-(
-      int iLen = ((wxFile *)this)->SeekEnd();
-      if ( iLen != -1 ) {
-        // restore old position
-        if ( ((wxFile *)this)->Seek(iRc) == -1 ) {
-          // error
-          iLen = -1;
+        // @ have to use const_cast :-(
+        int iLen = ((wxFile *)this)->SeekEnd();
+        if ( iLen != -1 ) {
+            // restore old position
+            if ( ((wxFile *)this)->Seek(iRc) == -1 ) {
+                // error
+                iLen = -1;
+            }

         }
         }

-      }

 
 

-      iRc = iLen;
+        iRc = iLen;

     }
     }

+#endif  // VC++

 
 

-  #endif  //_MSC_VER
-
-  if ( iRc == -1 ) {
-    wxLogSysError(_("can't find length of file on file descriptor %d"), m_fd);
-    return wxInvalidOffset;
-  }
-  else
-    return (off_t)iRc;
+    if ( iRc == -1 ) {
+        wxLogSysError(_("can't find length of file on file descriptor %d"), m_fd);
+        return wxInvalidOffset;
+    }
+    else
+        return (off_t)iRc;

 }
 
 // is end of file reached?
 bool wxFile::Eof() const
 {
 }
 
 // is end of file reached?
 bool wxFile::Eof() const
 {

-  wxASSERT( IsOpened() );
+    wxASSERT( IsOpened() );

 
 

-  int iRc;
+    int iRc;

 
 

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

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

-          ofsMax = Length();
+    ofsMax = Length();

     if ( ofsCur == wxInvalidOffset || ofsMax == wxInvalidOffset )
     if ( ofsCur == wxInvalidOffset || ofsMax == wxInvalidOffset )

-      iRc = -1;
+        iRc = -1;

     else
     else

-     iRc = ofsCur == ofsMax;
-  #else  // Windows and "native" compiler
+        iRc = ofsCur == ofsMax;
+#else  // Windows and "native" compiler

     iRc = eof(m_fd);
     iRc = eof(m_fd);

-  #endif // Windows/Unix
+#endif // Windows/Unix

 
 

-  switch ( iRc ) {
-    case 1:
-      break;
+    switch ( iRc ) {
+        case 1:
+            break;

 
 

-    case 0:
-      return FALSE;
+        case 0:
+            return FALSE;

 
 

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

 
 

-    default:
-      wxFAIL_MSG(_("invalid eof() return value."));
-  }
+        default:
+            wxFAIL_MSG(_("invalid eof() return value."));
+    }

 
 

-  return TRUE;
+    return TRUE;

 }
 
 // ============================================================================
 }
 
 // ============================================================================


@@ -439,37 +469,66 @@ descriptor %d"), m_fd);
 // ----------------------------------------------------------------------------
 wxTempFile::wxTempFile(const wxString& strName)
 {
 // ----------------------------------------------------------------------------
 wxTempFile::wxTempFile(const wxString& strName)
 {

-  Open(strName);
+    Open(strName);

 }
 
 bool wxTempFile::Open(const wxString& strName)
 {
 }
 
 bool wxTempFile::Open(const wxString& 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 char *szMktempSuffix = "XXXXXX";
+    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;
     m_strTemp << strName << szMktempSuffix;

-    mktemp((char *)m_strTemp.c_str()); // will do because length doesn't change
-  #else // Windows
+    mktemp(MBSTRINGCAST m_strTemp.mb_str()); // will do because length doesn't change
+#else // Windows

     wxString strPath;
     wxSplitPath(strName, &strPath, NULL, NULL);
     if ( strPath.IsEmpty() )
     wxString strPath;
     wxSplitPath(strName, &strPath, NULL, NULL);
     if ( strPath.IsEmpty() )

-      strPath = '.';  // GetTempFileName will fail if we give it empty string
+        strPath = _T('.');  // GetTempFileName will fail if we give it empty string

 #ifdef __WIN32__
 #ifdef __WIN32__

-    if ( !GetTempFileName(strPath, "wx_",0, m_strTemp.GetWriteBuf(MAX_PATH)) )
+    if ( !GetTempFileName(strPath, _T("wx_"),0, m_strTemp.GetWriteBuf(MAX_PATH)) )

 #else
 #else

-    // Not sure why MSVC++ 1.5 header defines first param as BYTE - bug?
-    if ( !GetTempFileName((BYTE) (const char*) strPath, "wx_",0, m_strTemp.GetWriteBuf(MAX_PATH)) )
+        // Not sure why MSVC++ 1.5 header defines first param as BYTE - bug?
+        if ( !GetTempFileName((BYTE) (const wxChar*) strPath, _T("wx_"),0, m_strTemp.GetWriteBuf(MAX_PATH)) )

 #endif
 #endif

-      wxLogLastError("GetTempFileName");
+            wxLogLastError(_T("GetTempFileName"));

     m_strTemp.UngetWriteBuf();
     m_strTemp.UngetWriteBuf();

-  #endif  // Windows/Unix
+#endif  // Windows/Unix
+
+    int access = wxS_DEFAULT;
+#ifdef __UNIX__
+    // create the file with the same mode as the original one under Unix
+    struct stat st;
+    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;
+    }
+    else
+    {
+        wxLogLastError(_T("stat"));
+    }
+
+    // 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
+    mode_t umaskOld = umask(0);
+#endif // Unix
+
+    bool ok =  m_file.Open(m_strTemp, wxFile::write, access);
+
+#ifdef __UNIX__
+    // restore umask now that the file is created
+    (void)umask(umaskOld);
+#endif // Unix

 
 

-  return m_file.Open(m_strTemp, wxFile::write);
+    return ok;

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


@@ -478,30 +537,30 @@ bool wxTempFile::Open(const wxString& strName)
 
 wxTempFile::~wxTempFile()
 {
 
 wxTempFile::~wxTempFile()
 {

-  if ( IsOpened() )
-    Discard();
+    if ( IsOpened() )
+        Discard();

 }
 
 bool wxTempFile::Commit()
 {
 }
 
 bool wxTempFile::Commit()
 {

-  m_file.Close();
+    m_file.Close();

 
 

-  if ( wxFile::Exists(m_strName) && remove(m_strName) != 0 ) {
-    wxLogSysError(_("can't remove file '%s'"), m_strName.c_str());
-    return FALSE;
-  }
+    if ( wxFile::Exists(m_strName) && remove(m_strName.fn_str()) != 0 ) {
+        wxLogSysError(_("can't remove file '%s'"), m_strName.c_str());
+        return FALSE;
+    }

 
 

-  if ( rename(m_strTemp, m_strName) != 0 ) {
-    wxLogSysError(_("can't commit changes to file '%s'"), m_strName.c_str());
-    return FALSE;
-  }
+    if ( rename(m_strTemp.fn_str(), m_strName.fn_str()) != 0 ) {
+        wxLogSysError(_("can't commit changes to file '%s'"), m_strName.c_str());
+        return FALSE;
+    }

 
 

-  return TRUE;
+    return TRUE;

 }
 
 void wxTempFile::Discard()
 {
 }
 
 void wxTempFile::Discard()
 {

-  m_file.Close();
-  if ( remove(m_strTemp) != 0 )
-    wxLogSysError(_("can't remove temporary file '%s'"), m_strTemp.c_str());
+    m_file.Close();
+    if ( remove(m_strTemp.fn_str()) != 0 )
+        wxLogSysError(_("can't remove temporary file '%s'"), m_strTemp.c_str());

 }
 }