#define NOMCX
#endif
- #include <windows.h> // for GetTempFileName
#elif (defined(__UNIX__) || defined(__GNUWIN32__))
#include <unistd.h>
#ifdef __GNUWIN32__
#include <windows.h>
#endif
+#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
#ifndef __MWERKS__
#include <sys/types.h> // needed for stat
#include <sys/stat.h> // stat
+#elif ( defined(__MWERKS__) && defined(__WXMSW__) )
+ #include <sys/types.h> // needed for stat
+ #include <sys/stat.h> // stat
#endif
#if defined(__BORLANDC__) || defined(_MSC_VER)
#endif // Salford C
// wxWindows
-#include "wx/string.h"
-#include "wx/intl.h"
+#ifndef WX_PRECOMP
+ #include "wx/string.h"
+ #include "wx/intl.h"
+ #include "wx/log.h"
+#endif // !WX_PRECOMP
+
+#include "wx/filename.h"
#include "wx/file.h"
-#include "wx/log.h"
// ============================================================================
// implementation of wxFile
flags |= O_WRONLY | O_CREAT | O_TRUNC;
break;
+ case write_excl:
+ flags |= O_WRONLY | O_CREAT | O_EXCL;
+ break;
+
case read_write:
flags |= O_RDWR;
break;
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();
// ----------------------------------------------------------------------------
// construction
// ----------------------------------------------------------------------------
+
wxTempFile::wxTempFile(const wxString& strName)
{
Open(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.
-#if defined(__UNIX__) || defined(__WXSTUBS__)|| defined( __WXMAC__ )
- static const wxChar *szMktempSuffix = wxT("XXXXXX");
- m_strTemp << strName << szMktempSuffix;
- // 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 = wxT("XXX");
- m_strTemp << strName << szMktempSuffix;
- ::DosCreateDir(m_strTemp.GetWriteBuf(MAX_PATH), NULL);
-#else // Windows
- wxString strPath;
- wxSplitPath(strName, &strPath, NULL, NULL);
- if ( strPath.IsEmpty() )
- strPath = wxT('.'); // GetTempFileName will fail if we give it empty string
-#ifdef __WIN32__
- if ( !GetTempFileName(strPath, wxT("wx_"),0, m_strTemp.GetWriteBuf(MAX_PATH)) )
-#else
- // Not sure why MSVC++ 1.5 header defines first param as BYTE - bug?
- if ( !GetTempFileName((BYTE) (DWORD)(const wxChar*) strPath, wxT("wx_"),0, m_strTemp.GetWriteBuf(MAX_PATH)) )
-#endif
- wxLogLastError(wxT("GetTempFileName"));
- m_strTemp.UngetWriteBuf();
-#endif // Windows/Unix
+ // 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_strName = fn.GetFullPath();
+
+ m_strTemp = wxFileName::CreateTempFileName(m_strName, &m_file);
+
+ if ( m_strTemp.empty() )
+ {
+ // CreateTempFileName() failed
+ return FALSE;
+ }
- 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;
+ // the temp file should have the same permissions as the original one
+ mode_t mode;
wxStructStat st;
- if ( stat(strName.fn_str(), &st) == 0 )
+ if ( stat(m_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;
-
- // 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;
+ mode = st.st_mode;
}
else
{
- // file probably didn't exist, just create with default mode _using_
- // user's umask (new files creation should respet umask)
- changedUmask = FALSE;
+ // file probably didn't exist, just give it the default mode _using_
+ // user's umask (new files creation should respect umask)
+ mode_t mask = umask(0777);
+ mode = 0666 & ~mask;
+ umask(mask);
}
-#endif // Unix
-
- bool ok = m_file.Open(m_strTemp, wxFile::write, access);
-#ifdef __UNIX__
- if ( changedUmask )
+ if ( chmod(m_strTemp.mb_str(), mode) == -1 )
{
- // restore umask now that the file is created
- (void)umask(umaskOld);
+ wxLogSysError(_("Failed to set temporary file permissions"));
}
#endif // Unix
- return ok;
+ return TRUE;
}
// ----------------------------------------------------------------------------
wxLogSysError(_("can't remove temporary file '%s'"), m_strTemp.c_str());
}
-#endif
+#endif // wxUSE_FILE
projects / wxWidgets.git / blobdiff