extern wxChar *wxBuffer;
-#ifdef __WXMAC__
-#include "morefile.h"
-#include "moreextr.h"
-#include "fullpath.h"
-#include "fspcompa.h"
+#if defined(__WXMAC__) && !defined(__UNIX__)
+ #include "morefile.h"
+ #include "moreextr.h"
+ #include "fullpath.h"
+ #include "fspcompa.h"
#endif
IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxStringList)
{
register wxChar *d, *s, *nm;
wxChar lnm[_MAXPATHLEN];
- int q;
+ int q;
// Some compilers don't like this line.
// const wxChar trimchars[] = wxT("\n \t");
}
else
#else
- while ((*d++ = *s)) {
+ while ((*d++ = *s) != NULL) {
# ifndef __WXMSW__
if (*s == wxT('\\')) {
if ((*(d - 1) = *++s)) {
register wxChar *start = d;
register int braces = (*s == wxT('{') || *s == wxT('('));
register wxChar *value;
-#ifdef __VISAGECPP__
- // VA gives assignment in logical expr warning
- while (*d)
- *d++ = *s;
-#else
- while ((*d++ = *s))
-#endif
+ while ((*d++ = *s) != NULL)
if (braces ? (*s == wxT('}') || *s == wxT(')')) : !(wxIsalnum(*s) || *s == wxT('_')) )
break;
else
*--d = 0;
value = wxGetenv(braces ? start + 1 : start);
if (value) {
-#ifdef __VISAGECPP__
- // VA gives assignment in logical expr warning
- for ((d = start - 1); (*d); *d++ = *value++);
-#else
- for ((d = start - 1); (*d++ = *value++););
-#endif
+ for ((d = start - 1); (*d++ = *value++) != NULL;);
d--;
if (braces && *s)
s++;
*(d - 1) = SEP;
}
s = nm;
-#ifdef __VISAGECPP__
- // VA gives assignment in logical expr warning
- while (*d)
- *d++ = *s++;
-#else
- while ((*d++ = *s++));
-#endif
+ while ((*d++ = *s++) != NULL);
delete[] nm_tmp; // clean up alloc
/* Now clean up the buffer */
return wxRealPath(buf);
// and back again - or we get nasty problems with delimiters.
// Also, convert to lower case, since case is significant in UNIX.
-#ifdef __WXMAC__
+#if defined(__WXMAC__) && !defined(__UNIX__)
static char sMacFileNameConversion[ 1000 ] ;
// Copy files
bool
-wxCopyFile (const wxString& file1, const wxString& file2)
+wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)
{
+#if defined(__WIN32__)
+ // CopyFile() copies file attributes and modification time too, so use it
+ // instead of our code if available
+ //
+ // NB: 3rd parameter is bFailIfExists i.e. the inverse of overwrite
+ return ::CopyFile(file1, file2, !overwrite) != 0;
+#else // !Win32
wxStructStat fbuf;
// get permissions of file1
- if ( wxStat(file1, &fbuf) != 0 )
+ if ( wxStat(OS_FILENAME(file1), &fbuf) != 0 )
{
// the file probably doesn't exist or we haven't the rights to read
// from it anyhow
// remove file2, if it exists. This is needed for creating
// file2 with the correct permissions in the next step
- if ( wxFileExists(file2) && !wxRemoveFile(file2) )
+ if ( wxFileExists(file2) && (!overwrite || !wxRemoveFile(file2)))
{
wxLogSysError(_("Impossible to overwrite the file '%s'"),
file2.c_str());
// create file2 with the same permissions than file1 and open it for
// writing
wxFile fileOut;
- if ( !fileOut.Create(file2, TRUE, fbuf.st_mode & 0777) )
+ if ( !fileOut.Create(file2, overwrite, fbuf.st_mode & 0777) )
return FALSE;
#ifdef __UNIX__
return FALSE;
}
-#ifndef __VISAGECPP__
-// no chmod in VA. SHould be some permission API for HPFS386 partitions however
- if ( chmod(file2, fbuf.st_mode) != 0 )
+ // we can expect fileIn to be closed successfully, but we should ensure
+ // that fileOut was closed as some write errors (disk full) might not be
+ // detected before doing this
+ if ( !fileIn.Close() || !fileOut.Close() )
+ return FALSE;
+
+#if !defined(__VISAGECPP__) && !defined(__WXMAC__) || defined(__UNIX__)
+ // no chmod in VA. Should be some permission API for HPFS386 partitions
+ // however
+ if ( chmod(OS_FILENAME(file2), fbuf.st_mode) != 0 )
{
wxLogSysError(_("Impossible to set permissions for the file '%s'"),
file2.c_str());
return FALSE;
}
-#endif
+#endif // OS/2 || Mac
+
return TRUE;
+#endif // __WXMSW__ && __WIN32__
}
bool
wxRenameFile (const wxString& file1, const wxString& file2)
{
// Normal system call
- if ( wxRename (OS_FILENAME(file1), OS_FILENAME(file2)) == 0 )
+ if ( wxRename (file1, file2) == 0 )
return TRUE;
// Try to copy
bool wxMkdir(const wxString& dir, int perm)
{
-#if defined( __WXMAC__ )
+#if defined(__WXMAC__) && !defined(__UNIX__)
return (mkdir(wxUnix2MacFilename( dir ) , 0 ) == 0);
#else // !Mac
const wxChar *dirname = dir.c_str();
#elif defined(__WXPM__)
if (::DosCreateDir((PSZ)dirname, NULL) != 0) // enhance for EAB's??
#else // !MSW and !OS/2 VAC++
+ (void)perm;
if ( wxMkDir(wxFNSTRINGCAST wxFNCONV(dirname)) != 0 )
#endif // !MSW/MSW
{
char *cbuf = new char[sz+1];
#ifdef _MSC_VER
if (_getcwd(cbuf, sz) == NULL) {
-#elif defined( __WXMAC__)
+#elif defined(__WXMAC__) && !defined(__UNIX__)
enum
{
SFSaveDisk = 0x214, CurDirStore = 0x398
#else // wxUnicode
#ifdef _MSC_VER
if (_getcwd(buf, sz) == NULL) {
-#elif defined( __WXMAC__)
+#elif defined(__WXMAC__) && !defined(__UNIX__)
FSSpec cwdSpec ;
FCBPBRec pb;
OSErr error;
pb.ioRefNum = LMGetCurApRefNum();
pb.ioFCBIndx = 0;
error = PBGetFCBInfoSync(&pb);
- if ( error == noErr )
+ if ( error == noErr )
{
cwdSpec.vRefNum = pb.ioFCBVRefNum;
cwdSpec.parID = pb.ioFCBParID;
buf[0] = 0 ;
/*
this version will not always give back the application directory on mac
- enum
- {
- SFSaveDisk = 0x214, CurDirStore = 0x398
+ enum
+ {
+ SFSaveDisk = 0x214, CurDirStore = 0x398
};
FSSpec cwdSpec ;
pattern++;
ret_code = FALSE;
while ((*str!=wxT('\0'))
- && (!(ret_code=wxMatchWild(pattern, str++, FALSE))))
+ && ((ret_code=wxMatchWild(pattern, str++, FALSE)) == 0))
/*loop*/;
if (ret_code) {
while (*str != wxT('\0'))
projects / wxWidgets.git / blobdiff