X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/246037e22990a4719c672c2e2a8b62b99cc4d49c..a1a2adef0792a4accda1a7c48052dbfd9511c5fa:/src/common/file.cpp?ds=sidebyside

diff --git a/src/common/file.cpp b/src/common/file.cpp
index 4372a8092b..1e3734b5d6 100644
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -102,6 +102,9 @@
 #include  <wx/file.h>
 #include  <wx/log.h>
 
+#ifndef MAX_PATH
+#define MAX_PATH 512
+#endif
 
 // ============================================================================
 // implementation of wxFile
@@ -143,7 +146,7 @@ bool wxFile::Create(const char *szFileName, bool bOverwrite, int access)
   int fd = open(szFileName, O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL), access);
 
   if ( fd == -1 ) {
-    wxLogSysError(_("can't create file '%s'"), szFileName);
+    wxLogSysError("can't create file '%s'", szFileName);
     return FALSE;
   }
   else {
@@ -178,7 +181,7 @@ bool wxFile::Open(const char *szFileName, OpenMode mode, int access)
   int fd = open(szFileName, flags, access);
 
   if ( fd == -1 ) {
-    wxLogSysError(_("can't open file '%s'"), szFileName);
+    wxLogSysError("can't open file '%s'", szFileName);
     return FALSE;
   }
   else {
@@ -192,7 +195,7 @@ bool wxFile::Close()
 {
   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;
     }
@@ -214,8 +217,8 @@ 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);
-    return ofsInvalid;
+    wxLogSysError("can't read from file descriptor %d", m_fd);
+    return wxInvalidOffset;
   }
   else
     return (uint)iRc;
@@ -228,22 +231,22 @@ uint wxFile::Write(const void *pBuf, uint nCount)
 
   int iRc = ::write(m_fd, pBuf, nCount);
   if ( iRc == -1 ) {
-    wxLogSysError(_("can't write to file descriptor %d"), m_fd);
+    wxLogSysError("can't write to file descriptor %d", m_fd);
     m_error = TRUE;
     return 0;
   }
   else
-    return (uint)iRc;
+    return iRc;
 }
 
 // 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);
+      wxLogSysError("can't flush file descriptor %d", m_fd);
       return FALSE;
     }
   }
@@ -280,8 +283,8 @@ off_t wxFile::Seek(off_t ofs, wxSeekMode mode)
 
   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;
@@ -294,8 +297,8 @@ 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);
-    return ofsInvalid;
+    wxLogSysError("can't get seek position on file descriptor %d", m_fd);
+    return wxInvalidOffset;
   }
   else
     return (off_t)iRc;
@@ -327,8 +330,8 @@ off_t wxFile::Length() const
   #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;
@@ -345,7 +348,7 @@ bool wxFile::Eof() const
     // @@ 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;
@@ -361,8 +364,8 @@ bool wxFile::Eof() const
       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:
@@ -401,7 +404,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
+#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
@@ -424,12 +432,12 @@ bool wxTempFile::Commit()
   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 ) {
-    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;
   }
 
@@ -440,5 +448,5 @@ void wxTempFile::Discard()
 {
   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());
 }