Updated configure (not only configure.in)

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

diff --git a/src/common/file.cpp b/src/common/file.cpp
index 366a3842d7cfc061297532fe02a29a47fdc38da1..83d73611a03e34f8755dd4bd4a1294634ee2d491 100644 (file)
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -20,14 +20,15 @@
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"

-#include "wx/defs.h"

 
 #ifdef __BORLANDC__
 
 #ifdef __BORLANDC__

-    #pragma hdrstop
+  #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_FILE
+

 // standard
 // standard

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

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


@@ -59,6 +60,11 @@
     #ifdef __GNUWIN32__
         #include <windows.h>
     #endif
     #ifdef __GNUWIN32__
         #include <windows.h>
     #endif

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


@@ -156,16 +162,23 @@
 // ----------------------------------------------------------------------------
 // static functions
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // static functions
 // ----------------------------------------------------------------------------

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

 {
     struct stat st;
 {
     struct stat st;

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

 
 

+    return !access(fname, 0) &&
+           !stat(wxMBSTRINGCAST fname, &st) &&
+           (st.st_mode & S_IFREG);
+#else

     return !access(name, 0) &&
     return !access(name, 0) &&

-           !stat((char*) name, &st) &&
+           !stat((wxChar*) name, &st) &&

            (st.st_mode & S_IFREG);
            (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;
 


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

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

     }
 
     }
 

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

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


@@ -190,7 +203,7 @@ 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;


@@ -198,18 +211,12 @@ wxFile::wxFile(const char *szFileName, OpenMode mode)
     Open(szFileName, mode);
 }
 
     Open(szFileName, mode);
 }
 

-// dtor
-wxFile::~wxFile()
-{
-    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 accessMode)
+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(szFileName,
+    int fd = open(wxFNCONV(szFileName),

                   O_WRONLY | O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL)
                   ACCESS(accessMode));
 
                   O_WRONLY | O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL)
                   ACCESS(accessMode));
 


@@ -224,7 +231,7 @@ bool wxFile::Create(const char *szFileName, bool bOverwrite, int accessMode)
 }
 
 // open the file
 }
 
 // open the file

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

 {
     int flags = O_BINARY;
 
 {
     int flags = O_BINARY;
 


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

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

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


@@ -342,25 +349,25 @@ off_t wxFile::Seek(off_t ofs, wxSeekMode mode)
 {
     wxASSERT( IsOpened() );
 
 {
     wxASSERT( IsOpened() );
 

-    int flag = -1;
+    int origin;

     switch ( mode ) {
     switch ( mode ) {

+        default:
+            wxFAIL_MSG(_("unknown seek origin"));
+

         case wxFromStart:
         case wxFromStart:

-            flag = SEEK_SET;
+            origin = SEEK_SET;

             break;
 
         case wxFromCurrent:
             break;
 
         case wxFromCurrent:

-            flag = SEEK_CUR;
+            origin = SEEK_CUR;

             break;
 
         case wxFromEnd:
             break;
 
         case wxFromEnd:

-            flag = SEEK_END;
+            origin = SEEK_END;

             break;
             break;

-
-        default:
-            wxFAIL_MSG(_("unknown seek origin"));

     }
 
     }
 

-    int iRc = lseek(m_fd, ofs, flag);
+    int iRc = lseek(m_fd, ofs, origin);

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


@@ -474,51 +481,68 @@ bool wxTempFile::Open(const wxString& strName)
     // 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__ )
     // 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";
+    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
+    // 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() )
 #else // Windows
     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
         // Not sure why MSVC++ 1.5 header defines first param as BYTE - bug?
 #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)) )
+        if ( !GetTempFileName((BYTE) (DWORD)(const wxChar*) strPath, T("wx_"),0, m_strTemp.GetWriteBuf(MAX_PATH)) )

 #endif
 #endif

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

     m_strTemp.UngetWriteBuf();
 #endif  // Windows/Unix
 
     int access = wxS_DEFAULT;
 #ifdef __UNIX__
     // create the file with the same mode as the original one under Unix
     m_strTemp.UngetWriteBuf();
 #endif  // Windows/Unix
 
     int access = wxS_DEFAULT;
 #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;
+

     struct stat st;
     struct stat st;

-    if ( stat(strName, &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;
     {
         // 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;

     }
     else
     {
     }
     else
     {

-        wxLogLastError("stat");
+        // file probably didn't exist, just create with default mode _using_
+        // user's umask (new files creation should respet umask)
+        changedUmask = FALSE;

     }
     }

-
-    // 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
 
 #endif // Unix
 

-    bool ok =  m_file.Open(m_strTemp, wxFile::write, access);
+    bool ok = m_file.Open(m_strTemp, wxFile::write, access);

 
 #ifdef __UNIX__
 
 #ifdef __UNIX__

-    // restore umask now that the file is created
-    (void)umask(umaskOld);
+    if ( changedUmask )
+    {
+        // restore umask now that the file is created
+        (void)umask(umaskOld);
+    }

 #endif // Unix
 
     return ok;
 #endif // Unix
 
     return ok;


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

-    if ( wxFile::Exists(m_strName) && remove(m_strName) != 0 ) {
+    if ( wxFile::Exists(m_strName) && remove(m_strName.fn_str()) != 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, m_strName) != 0 ) {
+    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;
     }
         wxLogSysError(_("can't commit changes to file '%s'"), m_strName.c_str());
         return FALSE;
     }


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

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

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

+
+#endif
+