// Created: 29/01/98
// RCS-ID: $Id$
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence: wxWindows license
+// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
// ----------------------------------------------------------------------------
#endif
// standard
-#if defined(__WINDOWS__) && !defined(__GNUWIN32__)
+#if defined(__WXMSW__) && !defined(__GNUWIN32__)
#include <io.h>
+
+ #define WIN32_LEAN_AND_MEAN
+ #define NOSERVICE
+ #define NOIME
+ #define NOATOM
+ #define NOGDI
+ #define NOGDICAPMASKS
+ #define NOMETAFILE
+ #define NOMINMAX
+ #define NOMSG
+ #define NOOPENFILE
+ #define NORASTEROPS
+ #define NOSCROLL
+ #define NOSOUND
+ #define NOSYSMETRICS
+ #define NOTEXTMETRIC
+ #define NOWH
+ #define NOCOMM
+ #define NOKANJI
+ #define NOCRYPT
+ #define NOMCX
+ #include <windows.h> // for GetTempFileName
#elif (defined(__UNIX__) || defined(__GNUWIN32__))
#include <unistd.h>
#else
- #error "Please specify the header with file functions declarations."
+ #error "Please specify the header with file functions declarations."
#endif //Win/UNIX
#include <stdio.h> // SEEK_xxx constants
#define S_IFDIR _S_IFDIR
#define S_IFREG _S_IFREG
-
- #define S_IREAD _S_IREAD
- #define S_IWRITE _S_IWRITE
#else
#define tell(fd) lseek(fd, 0, SEEK_CUR)
#endif //_MSC_VER
// there is no distinction between text and binary files under Unix
-#ifdef __UNIX__
- #define O_BINARY (0)
-#endif //__UNIX__
+#ifdef __UNIX__
+ #define O_BINARY (0)
+#endif //__UNIX__
// wxWindows
#include <wx/string.h>
#include <wx/file.h>
#include <wx/log.h>
+#ifndef MAX_PATH
+#define MAX_PATH 512
+#endif
// ============================================================================
// implementation of wxFile
// static functions
// ----------------------------------------------------------------------------
bool wxFile::Exists(const char *sz)
-{
- struct stat st;
+{
+ struct stat st;
return !access(sz, 0) && !stat(sz, &st) && (st.st_mode & S_IFREG);
}
wxFile::wxFile(const char *szFileName, OpenMode mode)
{
m_fd = fd_invalid;
+ m_error = FALSE;
Open(szFileName, mode);
}
}
// create the file, fail if it already exists and bOverwrite
-bool wxFile::Create(const char *szFileName, bool bOverwrite)
+bool wxFile::Create(const char *szFileName, bool bOverwrite, int access)
{
// 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, O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL));
+ int fd = open(szFileName, O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL), access);
if ( fd == -1 ) {
wxLogSysError("can't create file '%s'", szFileName);
}
// open the file
-bool wxFile::Open(const char *szFileName, OpenMode mode)
+bool wxFile::Open(const char *szFileName, OpenMode mode, int access)
{
int flags = O_BINARY;
switch ( mode ) {
- case read:
- flags |= O_RDONLY;
+ case read:
+ flags |= O_RDONLY;
break;
- case write:
- flags |= O_WRONLY | O_CREAT | O_TRUNC;
+ case write:
+ flags |= O_WRONLY | O_CREAT | O_TRUNC;
break;
case write_append:
flags |= O_WRONLY | O_APPEND;
break;
- case read_write:
+ case read_write:
flags |= O_RDWR;
break;
}
- int fd = open(szFileName, flags, S_IREAD | S_IWRITE);
+ int fd = open(szFileName, flags, access);
if ( fd == -1 ) {
wxLogSysError("can't open file '%s'", szFileName);
// read
off_t wxFile::Read(void *pBuf, off_t nCount)
{
- wxCHECK_RET( (pBuf != NULL) && IsOpened(), 0 );
+ wxCHECK( (pBuf != NULL) && IsOpened(), 0 );
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
return (uint)iRc;
}
// write
-bool wxFile::Write(const void *pBuf, uint nCount)
+uint wxFile::Write(const void *pBuf, uint nCount)
{
- wxCHECK_RET( (pBuf != NULL) && IsOpened(), 0 );
+ wxCHECK( (pBuf != NULL) && IsOpened(), 0 );
int iRc = ::write(m_fd, pBuf, nCount);
if ( iRc == -1 ) {
wxLogSysError("can't write to file descriptor %d", m_fd);
- return FALSE;
+ m_error = TRUE;
+ return 0;
}
else
- return TRUE;
+ return iRc;
}
// flush
// ----------------------------------------------------------------------------
// seek
-off_t wxFile::Seek(off_t ofs, SeekMode mode)
+off_t wxFile::Seek(off_t ofs, wxSeekMode mode)
{
wxASSERT( IsOpened() );
int flag = -1;
switch ( mode ) {
- case FromStart:
+ case wxFromStart:
flag = SEEK_SET;
break;
- case FromCurrent:
+ case wxFromCurrent:
flag = SEEK_CUR;
break;
- case FromEnd:
+ case wxFromEnd:
flag = SEEK_END;
break;
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;
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
int iRc = tell(m_fd);
if ( iRc != -1 ) {
- // @ have to use const_cast :-(
+ // @ have to use const_cast :-(
int iLen = ((wxFile *)this)->SeekEnd();
if ( iLen != -1 ) {
// restore old position
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;
// @@ 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;
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
#ifdef __UNIX__
static const char *szMktempSuffix = "XXXXXX";
m_strTemp << strName << szMktempSuffix;
- mktemp((char *)m_strTemp.c_str()); // @@@ even if the length doesn't change
- //m_strTemp.UngetWriteBuf();
+ mktemp((char *)m_strTemp.c_str()); // will do because length doesn't change
#else // Windows
- m_strTemp = tmpnam(NULL);
+ wxString strPath;
+ 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
-
+
return m_file.Open(m_strTemp, wxFile::write);
}
projects / wxWidgets.git / blobdiff