#if wxUSE_FILE
// standard
-#if defined(__WXMSW__) && !defined(__GNUWIN32__) && !defined(__WXWINE__)
+#if defined(__WXMSW__) && !defined(__GNUWIN32__) && !defined(__WXWINE__) && !defined(__WXMICROWIN__)
#include <io.h>
#ifndef __SALFORDC__
#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(__WXMAC__))
+#if __MSL__ < 0x6000
int access( const char *path, int mode ) { return 0 ; }
+#else
+ int _access( const char *path, int mode ) { return 0 ; }
+#endif
char* mktemp( char * path ) { return path ;}
- #include <unistd.h>
- #include <unix.h>
+ #include <stat.h>
#define W_OK 2
#define R_OK 4
+ #include <unistd.h>
#else
#error "Please specify the header with file functions declarations."
#endif //Win/UNIX
#include <sys/stat.h> // stat
#endif
-// Microsoft compiler loves underscores, feed them to it
-#ifdef __VISUALC__
- // functions
- #define open _open
- #define close _close
- #define read _read
- #define write _write
- #define lseek _lseek
- #define fsync _commit
- #define access _access
- #define eof _eof
-
- // types
- #define stat _stat
-
- // constants
-
- #define O_RDONLY _O_RDONLY
- #define O_WRONLY _O_WRONLY
- #define O_RDWR _O_RDWR
- #define O_EXCL _O_EXCL
- #define O_CREAT _O_CREAT
- #define O_BINARY _O_BINARY
-
- #define S_IFDIR _S_IFDIR
- #define S_IFREG _S_IFREG
-#else
- #define tell(fd) lseek(fd, 0, SEEK_CUR)
-#endif // VC++
-
#if defined(__BORLANDC__) || defined(_MSC_VER)
#define W_OK 2
#define R_OK 4
#include <unix.h>
#endif
-// wxWindows
-#include "wx/string.h"
-#include "wx/intl.h"
-#include "wx/file.h"
-#include "wx/log.h"
-
#ifndef MAX_PATH
#define MAX_PATH 512
#endif
#define ACCESS(access) , (access)
#endif // Salford C
+// wxWindows
+#include "wx/string.h"
+#include "wx/intl.h"
+#include "wx/file.h"
+#include "wx/log.h"
+
// ============================================================================
// implementation of wxFile
// ============================================================================
// ----------------------------------------------------------------------------
bool wxFile::Exists(const wxChar *name)
{
- struct stat st;
+ wxStructStat st;
#if wxUSE_UNICODE && wxMBFILES
wxCharBuffer fname = wxConvFile.cWC2MB(name);
-#ifdef __WXMAC__
- return !access(wxUnix2MacFilename( name ) , 0) && !stat(wxUnix2MacFilename( name ), &st) && (st.st_mode & S_IFREG);
-#else
- return !access(fname, 0) &&
- !stat(wxMBSTRINGCAST fname, &st) &&
+ return !wxAccess(fname, 0) &&
+ !wxStat(wxMBSTRINGCAST fname, &st) &&
(st.st_mode & S_IFREG);
-#endif
-#else
-#ifdef __WXMAC__
- return !access(wxUnix2MacFilename( name ) , 0) && !stat(wxUnix2MacFilename( name ), &st) && (st.st_mode & S_IFREG);
+
#else
- return !access(name, 0) &&
- !stat((wxChar*) name, &st) &&
+ return !wxAccess(name, 0) &&
+ !wxStat(name, &st) &&
(st.st_mode & S_IFREG);
#endif
-#endif
}
bool wxFile::Access(const wxChar *name, OpenMode mode)
wxFAIL_MSG(wxT("bad wxFile::Access mode parameter."));
}
- return access(wxFNCONV(name), how) == 0;
+ return wxAccess(wxFNCONV(name), how) == 0;
}
// ----------------------------------------------------------------------------
{
// 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
-#ifdef __WXMAC__
- int fd = open(wxUnix2MacFilename( szFileName ), O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL), access);
+#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);
#else
- int fd = open(wxFNCONV(szFileName),
- O_WRONLY | O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL)
- ACCESS(accessMode));
+ int fd = wxOpen(wxFNCONV(szFileName),
+ O_BINARY | O_WRONLY | O_CREAT |
+ (bOverwrite ? O_TRUNC : O_EXCL)
+ ACCESS(accessMode));
#endif
if ( fd == -1 ) {
wxLogSysError(_("can't create file '%s'"), szFileName);
flags |= O_RDONLY;
break;
+ case write_append:
+ if ( wxFile::Exists(szFileName) )
+ {
+ flags |= O_WRONLY | O_APPEND;
+ break;
+ }
+ //else: fall through as write_append is the same as write if the
+ // file doesn't exist
+
case write:
flags |= O_WRONLY | O_CREAT | O_TRUNC;
break;
- case write_append:
- flags |= O_WRONLY | O_APPEND;
- break;
-
case read_write:
flags |= O_RDWR;
break;
}
-#ifdef __WXMAC__
- int fd = open(wxUnix2MacFilename( szFileName ), flags, access);
-#else
- int fd = open(wxFNCONV(szFileName), flags ACCESS(accessMode));
-#endif
+ int fd = wxOpen(wxFNCONV(szFileName), flags ACCESS(accessMode));
if ( fd == -1 ) {
wxLogSysError(_("can't open file '%s'"), szFileName);
return FALSE;
wxCHECK( (pBuf != NULL) && IsOpened(), 0 );
#ifdef __MWERKS__
+#if __MSL__ >= 0x6000
+ int iRc = ::write(m_fd, (void*) pBuf, nCount);
+#else
int iRc = ::write(m_fd, (const char*) pBuf, nCount);
+#endif
#else
int iRc = ::write(m_fd, pBuf, nCount);
#endif
{
if ( IsOpened() ) {
#if defined(__VISUALC__) || wxHAVE_FSYNC
- if ( fsync(m_fd) == -1 )
+ if ( wxFsync(m_fd) == -1 )
{
wxLogSysError(_("can't flush file descriptor %d"), m_fd);
return FALSE;
{
wxASSERT( IsOpened() );
- int iRc = tell(m_fd);
+ int iRc = wxTell(m_fd);
if ( iRc == -1 ) {
wxLogSysError(_("can't get seek position on file descriptor %d"), m_fd);
return wxInvalidOffset;
#ifdef __VISUALC__
int iRc = _filelength(m_fd);
#else // !VC++
- int iRc = tell(m_fd);
+ int iRc = wxTell(m_fd);
if ( iRc != -1 ) {
// @ have to use const_cast :-(
int iLen = ((wxFile *)this)->SeekEnd();
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:
// OS/2 supports that have them (HPFS, FAT32) and security (HPFS386)
static const wxChar *szMktempSuffix = wxT("XXX");
m_strTemp << strName << szMktempSuffix;
- mkdir(m_strTemp.GetWriteBuf(MAX_PATH));
+ ::DosCreateDir(m_strTemp.GetWriteBuf(MAX_PATH), NULL);
#else // Windows
wxString strPath;
wxSplitPath(strName, &strPath, NULL, NULL);
mode_t umaskOld = 0; // just to suppress compiler warning
bool changedUmask;
- struct stat st;
+ wxStructStat st;
if ( stat(strName.fn_str(), &st) == 0 )
{
// this assumes that only lower bits of st_mode contain the access
{
m_file.Close();
-#ifndef __WXMAC__
- if ( wxFile::Exists(m_strName) && remove(m_strName.fn_str()) != 0 ) {
+ if ( wxFile::Exists(m_strName) && wxRemove(m_strName) != 0 ) {
wxLogSysError(_("can't remove file '%s'"), m_strName.c_str());
return FALSE;
}
- if ( rename(m_strTemp.fn_str(), m_strName.fn_str()) != 0 ) {
+ if ( wxRename(m_strTemp, m_strName) != 0 ) {
wxLogSysError(_("can't commit changes to file '%s'"), m_strName.c_str());
return FALSE;
}
-#else
- if ( wxFile::Exists(m_strName) && remove(wxUnix2MacFilename( m_strName )) != 0 ) {
- wxLogSysError(_("can't remove file '%s'"), m_strName.c_str());
- return FALSE;
- }
-
- if ( rename(wxUnix2MacFilename( m_strTemp ), wxUnix2MacFilename( m_strName )) != 0 ) {
- wxLogSysError(_("can't commit changes to file '%s'"), m_strName.c_str());
- return FALSE;
- }
-#endif
return TRUE;
}
void wxTempFile::Discard()
{
m_file.Close();
-#ifndef __WXMAC__
- if ( remove(m_strTemp.fn_str()) != 0 )
+ if ( wxRemove(m_strTemp) != 0 )
wxLogSysError(_("can't remove temporary file '%s'"), m_strTemp.c_str());
-#else
- if ( remove( wxUnix2MacFilename(m_strTemp.fn_str())) != 0 )
- wxLogSysError(_("can't remove temporary file '%s'"), m_strTemp.c_str());
-#endif
}
#endif
projects / wxWidgets.git / blobdiff