added wxLocale::GetLanguageInfo()

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

diff --git a/src/common/file.cpp b/src/common/file.cpp
index 17b5627877f1282f8fa80f727e6dfcc9c3ac36c8..d5a136e7041ca65aa204f65346da9dc1dd3ef72f 100644 (file)
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -59,9 +59,16 @@
     #ifdef __GNUWIN32__
         #include <windows.h>
     #endif
     #ifdef __GNUWIN32__
         #include <windows.h>
     #endif

-#elif defined(__DOS__) && defined(__WATCOMC__)
-    #include <io.h>
-    char* mktemp(char *path) { return _mktemp(path); }
+#elif defined(__DOS__)
+    #if defined(__WATCOMC__)
+       #include <io.h>
+    #elif defined(__DJGPP__)
+       #include <io.h>
+       #include <unistd.h>
+       #include <stdio.h>
+    #else
+        #error  "Please specify the header with file functions declarations."
+    #endif

 #elif (defined(__WXPM__))
     #include <io.h>
     #define   W_OK        2
 #elif (defined(__WXPM__))
     #include <io.h>
     #define   W_OK        2


@@ -132,6 +139,10 @@
 #include  "wx/filename.h"
 #include  "wx/file.h"
 
 #include  "wx/filename.h"
 #include  "wx/file.h"
 

+#ifdef __WXMSW__
+    #include "wx/msw/mslu.h"
+#endif
+

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


@@ -142,18 +153,9 @@
 bool wxFile::Exists(const wxChar *name)
 {
     wxStructStat st;
 bool wxFile::Exists(const wxChar *name)
 {
     wxStructStat st;

-#if wxUSE_UNICODE && wxMBFILES
-    wxCharBuffer fname = wxConvFile.cWC2MB(name);
-
-    return !wxAccess(fname, 0) &&
-           !wxStat(wxMBSTRINGCAST fname, &st) &&
-           (st.st_mode & S_IFREG);
-
-#else

     return !wxAccess(name, 0) &&
            !wxStat(name, &st) &&
            (st.st_mode & S_IFREG);
     return !wxAccess(name, 0) &&
            !wxStat(name, &st) &&
            (st.st_mode & S_IFREG);

-#endif

 }
 
 bool wxFile::Access(const wxChar *name, OpenMode mode)
 }
 
 bool wxFile::Access(const wxChar *name, OpenMode mode)


@@ -173,7 +175,7 @@ bool wxFile::Access(const wxChar *name, OpenMode mode)
             wxFAIL_MSG(wxT("bad wxFile::Access mode parameter."));
     }
 
             wxFAIL_MSG(wxT("bad wxFile::Access mode parameter."));
     }
 

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

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


@@ -195,20 +197,22 @@ 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 defined(__WXMAC__) && !defined(__UNIX__)
     // 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 defined(__WXMAC__) && !defined(__UNIX__)

-  // Dominic Mazzoni [dmazzoni+@cs.cmu.edu] reports that open is still broken on the mac, so we replace
-  // int fd = open(wxUnix2MacFilename( szFileName ), O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL), access);
-  int fd = creat( szFileName , accessMode);
+    // Dominic Mazzoni [dmazzoni+@cs.cmu.edu] reports that open is still broken on the mac, so we replace
+    // int fd = open(wxUnix2MacFilename( szFileName ), O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL), access);
+    int fd = creat( szFileName , accessMode);

 #else
 #else

-    int fd = wxOpen(wxFNCONV(szFileName),
-                    O_BINARY | O_WRONLY | O_CREAT |
-                    (bOverwrite ? O_TRUNC : O_EXCL)
-                    ACCESS(accessMode));
+    int fd = wxOpen( szFileName,
+                     O_BINARY | O_WRONLY | O_CREAT |
+                     (bOverwrite ? O_TRUNC : O_EXCL)
+                     ACCESS(accessMode) );

 #endif
 #endif

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

         wxLogSysError(_("can't create file '%s'"), szFileName);
         return FALSE;
     }
         wxLogSysError(_("can't create file '%s'"), szFileName);
         return FALSE;
     }

-    else {
+    else
+    {

         Attach(fd);
         return TRUE;
     }
         Attach(fd);
         return TRUE;
     }


@@ -219,7 +223,8 @@ bool wxFile::Open(const wxChar *szFileName, OpenMode mode, int accessMode)
 {
     int flags = O_BINARY;
 
 {
     int flags = O_BINARY;
 

-    switch ( mode ) {
+    switch ( mode )
+    {

         case read:
             flags |= O_RDONLY;
             break;
         case read:
             flags |= O_RDONLY;
             break;


@@ -246,8 +251,9 @@ bool wxFile::Open(const wxChar *szFileName, OpenMode mode, int accessMode)
             break;
     }
 
             break;
     }
 

-    int fd = wxOpen(wxFNCONV(szFileName), flags ACCESS(accessMode));
-    if ( fd == -1 ) {
+    int fd = wxOpen( szFileName, flags ACCESS(accessMode));
+    if ( fd == -1 )
+    {

         wxLogSysError(_("can't open file '%s'"), szFileName);
         return FALSE;
     }
         wxLogSysError(_("can't open file '%s'"), szFileName);
         return FALSE;
     }


@@ -425,7 +431,7 @@ bool wxFile::Eof() const
 
     int iRc;
 
 
     int iRc;
 

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

     // @@ 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();


@@ -462,6 +468,7 @@ bool wxFile::Eof() const
 // ----------------------------------------------------------------------------
 // construction
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // construction
 // ----------------------------------------------------------------------------

+

 wxTempFile::wxTempFile(const wxString& strName)
 {
     Open(strName);
 wxTempFile::wxTempFile(const wxString& strName)
 {
     Open(strName);


@@ -469,9 +476,22 @@ wxTempFile::wxTempFile(const wxString& strName)
 
 bool wxTempFile::Open(const wxString& strName)
 {
 
 bool wxTempFile::Open(const wxString& strName)
 {

-    m_strName = strName;
+    // we must have an absolute filename because otherwise CreateTempFileName()
+    // would create the temp file in $TMP (i.e. the system standard location
+    // for the temp files) which might be on another volume/drive/mount and
+    // wxRename()ing it later to m_strName from Commit() would then fail
+    //
+    // with the absolute filename, the temp file is created in the same
+    // directory as this one which ensures that wxRename() may work later
+    wxFileName fn(strName);
+    if ( !fn.IsAbsolute() )
+    {
+        fn.Normalize(wxPATH_NORM_ABSOLUTE);
+    }

 
 

-    m_strTemp = wxFileName::CreateTempFileName(strName);
+    m_strName = fn.GetFullPath();
+
+    m_strTemp = wxFileName::CreateTempFileName(m_strName, &m_file);

 
     if ( m_strTemp.empty() )
     {
 
     if ( m_strTemp.empty() )
     {


@@ -479,19 +499,12 @@ bool wxTempFile::Open(const wxString& strName)
         return FALSE;
     }
 
         return FALSE;
     }
 

-    // actually open the file now (it must already exist)
-    if ( !m_file.Open(m_strTemp, wxFile::write) )
-    {
-        // opening existing file failed?
-        return FALSE;
-    }
-

 #ifdef __UNIX__
     // the temp file should have the same permissions as the original one
     mode_t mode;
 #ifdef __UNIX__
     // the temp file should have the same permissions as the original one
     mode_t mode;

-
+    

     wxStructStat st;
     wxStructStat st;

-    if ( stat(strName.fn_str(), &st) == 0 )
+    if ( stat( (const char*) m_strName.fn_str(), &st) == 0 )

     {
         mode = st.st_mode;
     }
     {
         mode = st.st_mode;
     }


@@ -504,7 +517,7 @@ bool wxTempFile::Open(const wxString& strName)
         umask(mask);
     }
 
         umask(mask);
     }
 

-    if ( chmod(m_strTemp.mb_str(), mode) == -1 )
+    if ( chmod( (const char*) m_strTemp.fn_str(), mode) == -1 )

     {
         wxLogSysError(_("Failed to set temporary file permissions"));
     }
     {
         wxLogSysError(_("Failed to set temporary file permissions"));
     }