* Fixed two memory leaks.

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

diff --git a/src/common/file.cpp b/src/common/file.cpp
index 9f2093cccdebd550416dd1d8185d69e3e3529446..44c4b7b77fedde9dca0ff1246a98c3803b70ded3 100644 (file)
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -7,7 +7,7 @@
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 // ----------------------------------------------------------------------------
 /////////////////////////////////////////////////////////////////////////////
 
 // ----------------------------------------------------------------------------


@@ -27,12 +27,37 @@
 #endif
 
 // standard
 #endif
 
 // standard

-#if    defined(__WINDOWS__) && !defined(__GNUWIN32__)
+#if   defined(__WXMSW__) && !defined(__GNUWIN32__)

   #include  <io.h>
   #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

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

+#elif (defined(__WXSTUBS__))
+  // Have to ifdef this for different environments
+  #include <io.h>

 #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
 #endif  //Win/UNIX
 
 #include  <stdio.h>       // SEEK_xxx constants


@@ -66,16 +91,21 @@
   #define   S_IFDIR     _S_IFDIR
   #define   S_IFREG     _S_IFREG
 
   #define   S_IFDIR     _S_IFDIR
   #define   S_IFREG     _S_IFREG
 

-  #define   S_IREAD     _S_IREAD
-  #define   S_IWRITE    _S_IWRITE
+  #define   W_OK        2
+  #define   R_OK        4

 #else
   #define   tell(fd)    lseek(fd, 0, SEEK_CUR)
 #endif  //_MSC_VER
 
 #else
   #define   tell(fd)    lseek(fd, 0, SEEK_CUR)
 #endif  //_MSC_VER
 

+#ifdef __BORLANDC__
+  #define   W_OK        2
+  #define   R_OK        4
+#endif
+

 // there is no distinction between text and binary files under Unix
 // there is no distinction between text and binary files under Unix

-#ifdef         __UNIX__
-       #define         O_BINARY                (0)
-#endif //__UNIX__
+#ifdef    __UNIX__
+  #define   O_BINARY    (0)
+#endif  //__UNIX__

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


@@ -83,6 +113,9 @@
 #include  <wx/file.h>
 #include  <wx/log.h>
 
 #include  <wx/file.h>
 #include  <wx/log.h>
 

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

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


@@ -91,10 +124,30 @@
 // ----------------------------------------------------------------------------
 // static functions
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // static functions
 // ----------------------------------------------------------------------------

-bool wxFile::Exists(const char *sz)
-{ 
-  struct stat st; 
-  return !access(sz, 0) && !stat(sz, &st) && (st.st_mode & S_IFREG);
+bool wxFile::Exists(const char *name)
+{
+  struct stat st;
+  return !access(name, 0) && !stat(name, &st) && (st.st_mode & S_IFREG);
+}
+
+bool wxFile::Access(const char *name, OpenMode mode)
+{
+  int how;
+
+  switch ( mode ) {
+    case read:
+      how = R_OK;
+      break;
+
+    case write:
+      how = W_OK;
+      break;
+
+    default:
+      wxFAIL_MSG("bad wxFile::Access mode parameter.");
+  }
+
+  return access(name, how) == 0;

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


@@ -105,6 +158,7 @@ bool wxFile::Exists(const char *sz)
 wxFile::wxFile(const char *szFileName, OpenMode mode)
 {
   m_fd = fd_invalid;
 wxFile::wxFile(const char *szFileName, OpenMode mode)
 {
   m_fd = fd_invalid;

+  m_error = FALSE;

 
   Open(szFileName, mode);
 }
 
   Open(szFileName, mode);
 }


@@ -116,14 +170,14 @@ wxFile::~wxFile()
 }
 
 // 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)
+bool wxFile::Create(const char *szFileName, bool bOverwrite, int access)

 {
   // 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(szFileName, O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL));
+  int fd = open(szFileName, O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL), access);

 
   if ( fd == -1 ) {
 
   if ( fd == -1 ) {

-    wxLogSysError("can't create file '%s'", szFileName);
+    wxLogSysError(_("can't create file '%s'"), szFileName);

     return FALSE;
   }
   else {
     return FALSE;
   }
   else {


@@ -133,32 +187,32 @@ bool wxFile::Create(const char *szFileName, bool bOverwrite)
 }
 
 // open the file
 }
 
 // open the file

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

 {
   int flags = O_BINARY;
 
   switch ( mode ) {
 {
   int flags = O_BINARY;
 
   switch ( mode ) {

-    case read:      
-      flags |= O_RDONLY; 
+    case read:
+      flags |= O_RDONLY;

       break;
 
       break;
 

-    case write:     
-      flags |= O_WRONLY | O_CREAT | O_TRUNC; 
+    case write:
+      flags |= O_WRONLY | O_CREAT | O_TRUNC;

       break;
 
     case write_append:
       flags |= O_WRONLY | O_APPEND;
       break;
 
       break;
 
     case write_append:
       flags |= O_WRONLY | O_APPEND;
       break;
 

-    case read_write: 
+    case read_write:

       flags |= O_RDWR;
       break;
   }
 
       flags |= O_RDWR;
       break;
   }
 

-  int fd = open(szFileName, flags, S_IREAD | S_IWRITE);
+  int fd = open(szFileName, flags, access);

 
   if ( fd == -1 ) {
 
   if ( fd == -1 ) {

-    wxLogSysError("can't open file '%s'", szFileName);
+    wxLogSysError(_("can't open file '%s'"), szFileName);

     return FALSE;
   }
   else {
     return FALSE;
   }
   else {


@@ -172,7 +226,7 @@ bool wxFile::Close()
 {
   if ( IsOpened() ) {
     if ( close(m_fd) == -1 ) {
 {
   if ( IsOpened() ) {
     if ( close(m_fd) == -1 ) {

-      wxLogSysError("can't close file descriptor %d", m_fd);
+      wxLogSysError(_("can't close file descriptor %d"), m_fd);

       m_fd = fd_invalid;
       return FALSE;
     }
       m_fd = fd_invalid;
       return FALSE;
     }


@@ -190,29 +244,30 @@ bool wxFile::Close()
 // read
 off_t wxFile::Read(void *pBuf, off_t nCount)
 {
 // read
 off_t wxFile::Read(void *pBuf, off_t nCount)
 {

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

 
   int iRc = ::read(m_fd, pBuf, nCount);
   if ( iRc == -1 ) {
 
   int iRc = ::read(m_fd, pBuf, nCount);
   if ( iRc == -1 ) {

-    wxLogSysError("can't read from file descriptor %d", m_fd);
-    return ofsInvalid;
+    wxLogSysError(_("can't read from file descriptor %d"), m_fd);
+    return wxInvalidOffset;

   }
   else
   }
   else

-    return (uint)iRc;
+    return (size_t)iRc;

 }
 
 // write
 }
 
 // write

-bool wxFile::Write(const void *pBuf, uint nCount)
+size_t wxFile::Write(const void *pBuf, size_t nCount)

 {
 {

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

 
   int iRc = ::write(m_fd, pBuf, nCount);
   if ( iRc == -1 ) {
 
   int iRc = ::write(m_fd, pBuf, nCount);
   if ( iRc == -1 ) {

-    wxLogSysError("can't write to file descriptor %d", m_fd);
-    return FALSE;
+    wxLogSysError(_("can't write to file descriptor %d"), m_fd);
+    m_error = TRUE;
+    return 0;

   }
   else
   }
   else

-    return TRUE;
+    return iRc;

 }
 
 // flush
 }
 
 // flush


@@ -222,7 +277,7 @@ bool wxFile::Flush()
                // @@@ fsync() is not ANSI (BSDish)
 //    if ( fsync(m_fd) == -1 ) { // TODO
       if (TRUE) {
                // @@@ fsync() is not ANSI (BSDish)
 //    if ( fsync(m_fd) == -1 ) { // TODO
       if (TRUE) {

-      wxLogSysError("can't flush file descriptor %d", m_fd);
+      wxLogSysError(_("can't flush file descriptor %d"), m_fd);

       return FALSE;
     }
   }
       return FALSE;
     }
   }


@@ -235,32 +290,32 @@ bool wxFile::Flush()
 // ----------------------------------------------------------------------------
 
 // seek
 // ----------------------------------------------------------------------------
 
 // seek

-off_t wxFile::Seek(off_t ofs, SeekMode mode)
+off_t wxFile::Seek(off_t ofs, wxSeekMode mode)

 {
   wxASSERT( IsOpened() );
 
   int flag = -1;
   switch ( mode ) {
 {
   wxASSERT( IsOpened() );
 
   int flag = -1;
   switch ( mode ) {

-    case FromStart:
+    case wxFromStart:

       flag = SEEK_SET;
       break;
 
       flag = SEEK_SET;
       break;
 

-    case FromCurrent:
+    case wxFromCurrent:

       flag = SEEK_CUR;
       break;
 
       flag = SEEK_CUR;
       break;
 

-    case FromEnd:
+    case wxFromEnd:

       flag = SEEK_END;
       break;
 
     default:
       flag = SEEK_END;
       break;
 
     default:

-      wxFAIL_MSG("unknown seek origin");
+      wxFAIL_MSG(_("unknown seek origin"));

   }
 
   int iRc = lseek(m_fd, ofs, flag);
   if ( iRc == -1 ) {
   }
 
   int iRc = lseek(m_fd, ofs, flag);
   if ( iRc == -1 ) {

-    wxLogSysError("can't seek on file descriptor %d", m_fd);
-    return ofsInvalid;
+    wxLogSysError(_("can't seek on file descriptor %d"), m_fd);
+    return wxInvalidOffset;

   }
   else
     return (off_t)iRc;
   }
   else
     return (off_t)iRc;


@@ -273,8 +328,8 @@ off_t wxFile::Tell() const
 
   int iRc = tell(m_fd);
   if ( iRc == -1 ) {
 
   int iRc = tell(m_fd);
   if ( iRc == -1 ) {

-    wxLogSysError("can't get seek position on file descriptor %d", m_fd);
-    return ofsInvalid;
+    wxLogSysError(_("can't get seek position on file descriptor %d"), m_fd);
+    return wxInvalidOffset;

   }
   else
     return (off_t)iRc;
   }
   else
     return (off_t)iRc;


@@ -290,7 +345,7 @@ off_t wxFile::Length() const
   #else
     int iRc = tell(m_fd);
     if ( iRc != -1 ) {
   #else
     int iRc = tell(m_fd);
     if ( iRc != -1 ) {

-                       // @ have to use const_cast :-(
+      // @ have to use const_cast :-(

       int iLen = ((wxFile *)this)->SeekEnd();
       if ( iLen != -1 ) {
         // restore old position
       int iLen = ((wxFile *)this)->SeekEnd();
       if ( iLen != -1 ) {
         // restore old position


@@ -306,8 +361,8 @@ off_t wxFile::Length() const
   #endif  //_MSC_VER
 
   if ( iRc == -1 ) {
   #endif  //_MSC_VER
 
   if ( iRc == -1 ) {

-    wxLogSysError("can't find length of file on file descriptor %d", m_fd);
-    return ofsInvalid;
+    wxLogSysError(_("can't find length of file on file descriptor %d"), m_fd);
+    return wxInvalidOffset;

   }
   else
     return (off_t)iRc;
   }
   else
     return (off_t)iRc;


@@ -324,7 +379,7 @@ bool wxFile::Eof() const
     // @@ 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();

-    if ( ofsCur == ofsInvalid || ofsMax == ofsInvalid )
+    if ( ofsCur == wxInvalidOffset || ofsMax == wxInvalidOffset )

       iRc = -1;
     else
      iRc = ofsCur == ofsMax;
       iRc = -1;
     else
      iRc = ofsCur == ofsMax;


@@ -340,12 +395,12 @@ 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:

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

   }
 
   return TRUE;
   }
 
   return TRUE;


@@ -366,20 +421,30 @@ wxTempFile::wxTempFile(const wxString& strName)
 bool wxTempFile::Open(const wxString& strName)
 {
   m_strName = 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.
   // 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.

-  #ifdef  __UNIX__
+  #if defined(__UNIX__) || defined(__WXSTUBS__)

     static const char *szMktempSuffix = "XXXXXX";
     m_strTemp << strName << szMktempSuffix;
     static const char *szMktempSuffix = "XXXXXX";
     m_strTemp << strName << szMktempSuffix;

-    mktemp((char *)m_strTemp.c_str()); // @@@ even if the length doesn't change
-    //m_strTemp.UngetWriteBuf();
+    mktemp((char *)m_strTemp.c_str()); // will do because length doesn't change

   #else // Windows
   #else // Windows

-    m_strTemp = tmpnam(NULL);
+    wxString strPath;
+    wxSplitPath(strName, &strPath, NULL, NULL);
+    if ( strPath.IsEmpty() )
+      strPath = '.';  // GetTempFileName will fail if we give it empty string
+#ifdef __WIN32__
+    if ( !GetTempFileName(strPath, "wx_",0, m_strTemp.GetWriteBuf(MAX_PATH)) )
+#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)) )
+#endif
+      wxLogLastError("GetTempFileName");
+    m_strTemp.UngetWriteBuf();

   #endif  // Windows/Unix
   #endif  // Windows/Unix

-    
+

   return m_file.Open(m_strTemp, wxFile::write);
 }
 
   return m_file.Open(m_strTemp, wxFile::write);
 }
 


@@ -398,12 +463,12 @@ bool wxTempFile::Commit()
   m_file.Close();
 
   if ( wxFile::Exists(m_strName) && remove(m_strName) != 0 ) {
   m_file.Close();
 
   if ( wxFile::Exists(m_strName) && remove(m_strName) != 0 ) {

-    wxLogSysError("can't remove file '%s'", m_strName.c_str());
+    wxLogSysError(_("can't remove file '%s'"), m_strName.c_str());

     return FALSE;
   }
 
   if ( rename(m_strTemp, m_strName) != 0 ) {
     return FALSE;
   }
 
   if ( rename(m_strTemp, m_strName) != 0 ) {

-    wxLogSysError("can't commit changes to file '%s'", m_strName.c_str());
+    wxLogSysError(_("can't commit changes to file '%s'"), m_strName.c_str());

     return FALSE;
   }
 
     return FALSE;
   }
 


@@ -414,5 +479,5 @@ void wxTempFile::Discard()
 {
   m_file.Close();
   if ( remove(m_strTemp) != 0 )
 {
   m_file.Close();
   if ( remove(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());

 }
 }