// Created: 29/01/98
// RCS-ID: $Id$
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence: wxWindows license
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// ----------------------------------------------------------------------------
#if wxUSE_FILE
// standard
-#if defined(__WXMSW__) && !defined(__GNUWIN32__) && !defined(__WXWINE__) && !defined(__WXMICROWIN__)
+#if defined(__WXMSW__) && !defined(__GNUWIN32__) && !defined(__WXMICROWIN__)
#include <io.h>
#ifndef __SALFORDC__
#elif (defined(__UNIX__) || defined(__GNUWIN32__))
#include <unistd.h>
+ #include <sys/stat.h>
#ifdef __GNUWIN32__
#include <windows.h>
#endif
#endif
#elif (defined(__WXPM__))
#include <io.h>
- #define W_OK 2
- #define R_OK 4
#elif (defined(__WXSTUBS__))
// Have to ifdef this for different environments
#include <io.h>
#endif
char* mktemp( char * path ) { return path ;}
#include <stat.h>
- #define W_OK 2
- #define R_OK 4
#include <unistd.h>
#else
#error "Please specify the header with file functions declarations."
#ifndef __MWERKS__
#include <sys/types.h> // needed for stat
#include <sys/stat.h> // stat
-#elif ( defined(__MWERKS__) && defined(__WXMSW__) )
+#elif defined(__MWERKS__) && ( defined(__WXMSW__) || defined(__MACH__) )
#include <sys/types.h> // needed for stat
#include <sys/stat.h> // stat
#endif
-#if defined(__BORLANDC__) || defined(_MSC_VER)
- #define W_OK 2
- #define R_OK 4
-#endif
+// Windows compilers don't have these constants
+#ifndef W_OK
+ enum
+ {
+ F_OK = 0, // test for existence
+ X_OK = 1, // execute permission
+ W_OK = 2, // write
+ R_OK = 4 // read
+ };
+#endif // W_OK
// there is no distinction between text and binary files under Unix, so define
// O_BINARY as 0 if the system headers don't do it already
#include "wx/filename.h"
#include "wx/file.h"
+#include "wx/filefn.h"
+
+#ifdef __WXMSW__
+ #include "wx/msw/mslu.h"
+#endif
// ============================================================================
// implementation of wxFile
// ----------------------------------------------------------------------------
// static functions
// ----------------------------------------------------------------------------
+
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);
-#endif
+ return wxFileExists(name);
}
bool wxFile::Access(const wxChar *name, OpenMode mode)
{
- int how = 0;
+ int how;
+
+ switch ( mode )
+ {
+ default:
+ wxFAIL_MSG(wxT("bad wxFile::Access mode parameter."));
+ // fall through
- switch ( mode ) {
case read:
how = R_OK;
break;
how = W_OK;
break;
- default:
- wxFAIL_MSG(wxT("bad wxFile::Access mode parameter."));
+ case read_write:
+ how = R_OK | W_OK;
+ break;
}
- return wxAccess(wxFNCONV(name), how) == 0;
+ return wxAccess(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
-#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);
+#if defined(__WXMAC__) && !defined(__UNIX__) && !wxUSE_UNICODE
+ // 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 = 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
- if ( fd == -1 ) {
+ if ( fd == -1 )
+ {
wxLogSysError(_("can't create file '%s'"), szFileName);
return FALSE;
}
- else {
+ else
+ {
Attach(fd);
return TRUE;
}
{
int flags = O_BINARY;
- switch ( mode ) {
+ switch ( mode )
+ {
case read:
flags |= O_RDONLY;
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;
}
// ----------------------------------------------------------------------------
// construction
// ----------------------------------------------------------------------------
+
wxTempFile::wxTempFile(const wxString& strName)
{
Open(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_strName = fn.GetFullPath();
- m_strTemp = wxFileName::CreateTempFileName(strName, &m_file);
+ m_strTemp = wxFileName::CreateTempFileName(m_strName, &m_file);
if ( m_strTemp.empty() )
{
#ifdef __UNIX__
// 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( (const char*) m_strName.fn_str(), &st) == 0 )
{
mode = st.st_mode;
}
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"));
}
projects / wxWidgets.git / blobdiff