* Fixed two memory leaks.

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

diff --git a/src/common/file.cpp b/src/common/file.cpp
index 4372a8092b92ce44d9495268e97463e133e42361..44c4b7b77fedde9dca0ff1246a98c3803b70ded3 100644 (file)
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -53,6 +53,9 @@
   #include  <windows.h>     // for GetTempFileName
 #elif (defined(__UNIX__) || defined(__GNUWIN32__))
   #include  <unistd.h>
   #include  <windows.h>     // for GetTempFileName
 #elif (defined(__UNIX__) || defined(__GNUWIN32__))
   #include  <unistd.h>

+#elif (defined(__WXSTUBS__))
+  // Have to ifdef this for different environments
+  #include <io.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


@@ -87,10 +90,18 @@
 
   #define   S_IFDIR     _S_IFDIR
   #define   S_IFREG     _S_IFREG
 
   #define   S_IFDIR     _S_IFDIR
   #define   S_IFREG     _S_IFREG

+
+  #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
 #ifdef    __UNIX__
   #define   O_BINARY    (0)
 // there is no distinction between text and binary files under Unix
 #ifdef    __UNIX__
   #define   O_BINARY    (0)


@@ -102,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


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

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

 {
   struct stat st;
 {
   struct stat st;

-  return !access(sz, 0) && !stat(sz, &st) && (st.st_mode & S_IFREG);
+  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;

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


@@ -215,14 +249,14 @@ off_t wxFile::Read(void *pBuf, off_t nCount)
   int iRc = ::read(m_fd, pBuf, nCount);
   if ( iRc == -1 ) {
     wxLogSysError(_("can't read from file descriptor %d"), m_fd);
   int iRc = ::read(m_fd, pBuf, nCount);
   if ( iRc == -1 ) {
     wxLogSysError(_("can't read from file descriptor %d"), m_fd);

-    return ofsInvalid;
+    return wxInvalidOffset;

   }
   else
   }
   else

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

 }
 
 // write
 }
 
 // write

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

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


@@ -233,14 +267,14 @@ uint wxFile::Write(const void *pBuf, uint nCount)
     return 0;
   }
   else
     return 0;
   }
   else

-    return (uint)iRc;
+    return iRc;

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

-// @@@ fsync() is not ANSI (BSDish)
+               // @@@ fsync() is not ANSI (BSDish)

 //    if ( fsync(m_fd) == -1 ) { // TODO
       if (TRUE) {
       wxLogSysError(_("can't flush file descriptor %d"), m_fd);
 //    if ( fsync(m_fd) == -1 ) { // TODO
       if (TRUE) {
       wxLogSysError(_("can't flush file descriptor %d"), m_fd);


@@ -275,13 +309,13 @@ off_t wxFile::Seek(off_t ofs, wxSeekMode mode)
       break;
 
     default:
       break;
 
     default:

-      wxFAIL_MSG("unknown seek origin");
+      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);
   }
 
   int iRc = lseek(m_fd, ofs, flag);
   if ( iRc == -1 ) {
     wxLogSysError(_("can't seek on file descriptor %d"), m_fd);

-    return ofsInvalid;
+    return wxInvalidOffset;

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


@@ -295,7 +329,7 @@ off_t wxFile::Tell() const
   int iRc = tell(m_fd);
   if ( iRc == -1 ) {
     wxLogSysError(_("can't get seek position on file descriptor %d"), m_fd);
   int iRc = tell(m_fd);
   if ( iRc == -1 ) {
     wxLogSysError(_("can't get seek position on file descriptor %d"), m_fd);

-    return ofsInvalid;
+    return wxInvalidOffset;

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


@@ -328,7 +362,7 @@ off_t wxFile::Length() const
 
   if ( iRc == -1 ) {
     wxLogSysError(_("can't find length of file on file descriptor %d"), m_fd);
 
   if ( iRc == -1 ) {
     wxLogSysError(_("can't find length of file on file descriptor %d"), m_fd);

-    return ofsInvalid;
+    return wxInvalidOffset;

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


@@ -345,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;


@@ -361,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;


@@ -392,7 +426,7 @@ bool wxTempFile::Open(const wxString& strName)
   // 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.
   // 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;
     mktemp((char *)m_strTemp.c_str()); // will do because length doesn't change
     static const char *szMktempSuffix = "XXXXXX";
     m_strTemp << strName << szMktempSuffix;
     mktemp((char *)m_strTemp.c_str()); // will do because length doesn't change


@@ -401,7 +435,12 @@ bool wxTempFile::Open(const wxString& strName)
     wxSplitPath(strName, &strPath, NULL, NULL);
     if ( strPath.IsEmpty() )
       strPath = '.';  // GetTempFileName will fail if we give it empty string
     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)) )
     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
       wxLogLastError("GetTempFileName");
     m_strTemp.UngetWriteBuf();
   #endif  // Windows/Unix