#define _MAXPATHLEN 1024
#endif
+#ifndef INVALID_FILE_ATTRIBUTES
+ #define INVALID_FILE_ATTRIBUTES ((DWORD)-1)
+#endif
+
// ----------------------------------------------------------------------------
// private globals
// ----------------------------------------------------------------------------
-// MT-FIXME: get rid of this horror and all code using it
+#if WXWIN_COMPATIBILITY_2_8
static wxChar wxFileFunctionsBuffer[4*_MAXPATHLEN];
+#endif
#if defined(__VISAGECPP__) && __IBMCPP__ >= 400
//
const int wxInvalidOffset = -1;
#endif
-// ----------------------------------------------------------------------------
-// macros
-// ----------------------------------------------------------------------------
-
-// translate the filenames before passing them to OS functions
-#define OS_FILENAME(s) (s.fn_str())
-
// ============================================================================
// implementation
// ============================================================================
// regardless of the mode parameter. This hack works around the problem by
// setting the mode with _wchmod.
//
-int wxCRT_Open(const wchar_t *pathname, int flags, mode_t mode)
+int wxCRT_OpenW(const wchar_t *pathname, int flags, mode_t mode)
{
int moreflags = 0;
}
// ----------------------------------------------------------------------------
-// miscellaneous global functions (TOFIX!)
+// miscellaneous global functions
// ----------------------------------------------------------------------------
+#if WXWIN_COMPATIBILITY_2_8
static inline wxChar* MYcopystring(const wxString& s)
{
wxChar* copy = new wxChar[s.length() + 1];
CharType* copy = new CharType[wxStrlen(s) + 1];
return wxStrcpy(copy, s);
}
+#endif
bool
// it can cope with network (UNC) paths unlike them
DWORD ret = ::GetFileAttributes(filename.fn_str());
- return (ret != (DWORD)-1) && !(ret & FILE_ATTRIBUTE_DIRECTORY);
+ return (ret != INVALID_FILE_ATTRIBUTES) && !(ret & FILE_ATTRIBUTE_DIRECTORY);
#else // !__WIN32__
#ifndef S_ISREG
#define S_ISREG(mode) ((mode) & S_IFREG)
return false ;
}
+#if WXWIN_COMPATIBILITY_2_8
/*
* Strip off any extension (dot something) from end of file,
* IF one exists. Inserts zero into buffer.
void wxStripExtension(wxString& buffer)
{
- //RN: Be careful about the handling the case where
- //buffer.length() == 0
- for(size_t i = buffer.length() - 1; i != wxString::npos; --i)
- {
- if (buffer.GetChar(i) == wxT('.'))
- {
- buffer = buffer.Left(i);
- break;
- }
- }
+ buffer = wxFileName::StripExtension(buffer);
}
// Destructive removal of /./ and /../ stuff
wxChar *wxCopyAbsolutePath(const wxString& filename)
{
if (filename.empty())
- return (wxChar *) NULL;
+ return NULL;
if (! wxIsAbsolutePath(wxExpandPath(wxFileFunctionsBuffer, filename)))
{
static wxChar dest[_MAXPATHLEN];
if (filename.empty())
- return (wxChar *) NULL;
+ return NULL;
wxStrcpy (dest, filename);
#ifdef __WXMSW__
return dest;
}
+#endif // #if WXWIN_COMPATIBILITY_2_8
+
// Return just the filename, not the path (basename)
wxChar *wxFileNameFromPath (wxChar *path)
{
}
#endif
}
- return (wxChar *) NULL;
+ return NULL;
}
// Return just the directory, or NULL if no directory
OSStatus err = noErr;
FSRef fsRef;
wxMacPathToFSRef( path , &fsRef );
- err = FSGetCatalogInfo(&fsRef, kFSCatInfoNone, NULL, NULL, spec, NULL);
+ err = FSGetCatalogInfo(&fsRef, kFSCatInfoNone, NULL, NULL, spec, NULL);
verify_noerr( err );
}
#endif
#endif // __WXMAC__
+
+#if WXWIN_COMPATIBILITY_2_8
+
template<typename T>
static void wxDoDos2UnixFilename(T *s)
{
if (s)
while (*s)
{
- if (*s == _T('\\'))
- *s = _T('/');
+ if (*s == wxT('\\'))
+ *s = wxT('/');
#ifdef __WXMSW__
else
*s = wxTolower(*s); // Case INDEPENDENT
void wxUnix2DosFilename(char *s) { wxDoUnix2DosFilename(s); }
void wxUnix2DosFilename(wchar_t *s) { wxDoUnix2DosFilename(s); }
+#endif // #if WXWIN_COMPATIBILITY_2_8
+
// Concatenate two files to form third
bool
wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& file3)
#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 )
+ if ( chmod(file2.fn_str(), fbuf.st_mode) != 0 )
{
wxLogSysError(_("Impossible to set permissions for the file '%s'"),
file2.c_str());
int res = 1;
// TODO with VFSFileDelete()
#else
- int res = unlink(OS_FILENAME(file));
+ int res = unlink(file.fn_str());
#endif
return res == 0;
{
#if defined(__WXPALMOS__)
return false;
-#elif defined(__WXMAC__) && !defined(__UNIX__)
- return (mkdir(dir.fn_str() , 0 ) == 0);
-#else // !Mac
- const wxChar *dirname = dir.c_str();
+#else
+#if defined(__WXMAC__) && !defined(__UNIX__)
+ if ( mkdir(dir.fn_str(), 0) != 0 )
// assume mkdir() has 2 args on non Windows-OS/2 platforms and on Windows too
// for the GNU compiler
-#if (!(defined(__WXMSW__) || defined(__OS2__) || defined(__DOS__))) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) || defined(__WINE__) || defined(__WXMICROWIN__)
+#elif (!(defined(__WXMSW__) || defined(__OS2__) || defined(__DOS__))) || \
+ (defined(__GNUWIN32__) && !defined(__MINGW32__)) || \
+ defined(__WINE__) || defined(__WXMICROWIN__)
+ const wxChar *dirname = dir.c_str();
#if defined(MSVCRT)
wxUnusedVar(perm);
if ( mkdir(wxFNCONV(dirname)) != 0 )
#endif
#elif defined(__OS2__)
wxUnusedVar(perm);
- if (::DosCreateDir((PSZ)dirname, NULL) != 0) // enhance for EAB's??
+ if (::DosCreateDir(dir.c_str(), NULL) != 0) // enhance for EAB's??
#elif defined(__DOS__)
+ const wxChar *dirname = dir.c_str();
#if defined(__WATCOMC__)
(void)perm;
if ( wxMkDir(wxFNSTRINGCAST wxFNCONV(dirname)) != 0 )
#endif
#else // !MSW, !DOS and !OS/2 VAC++
wxUnusedVar(perm);
-#ifdef __WXWINCE__
- if ( !CreateDirectory(dirname, NULL) )
-#else
+ #ifdef __WXWINCE__
+ if ( CreateDirectory(dir.fn_str(), NULL) == 0 )
+ #else
if ( wxMkDir(dir.fn_str()) != 0 )
-#endif
+ #endif
#endif // !MSW/MSW
{
- wxLogSysError(_("Directory '%s' couldn't be created"), dirname);
-
+ wxLogSysError(_("Directory '%s' couldn't be created"), dir);
return false;
}
return true;
-#endif // Mac/!Mac
+#endif // PALMOS/!PALMOS
}
bool wxRmdir(const wxString& dir, int WXUNUSED(flags))
{
#if defined(__VMS__)
return false; //to be changed since rmdir exists in VMS7.x
-#elif defined(__OS2__)
- return (::DosDeleteDir(dir.c_str()) == 0);
-#elif defined(__WXWINCE__)
- return (RemoveDirectory(dir) != 0);
#elif defined(__WXPALMOS__)
// TODO with VFSFileRename()
return false;
#else
- return (wxRmDir(OS_FILENAME(dir)) == 0);
-#endif
+ #if defined(__OS2__)
+ if ( ::DosDeleteDir(dir.c_str()) != 0 )
+ #elif defined(__WXWINCE__)
+ if ( RemoveDirectory(dir.fn_str()) == 0 )
+ #else
+ if ( wxRmDir(dir.fn_str()) != 0 )
+ #endif
+ {
+ wxLogSysError(_("Directory '%s' couldn't be deleted"), dir);
+ return false;
+ }
+
+ return true;
+#endif // PALMOS/!PALMOS
}
// does the path exists? (may have or not '/' or '\\' at the end)
while ( wxEndsWithPathSeparator(strPath) )
{
size_t len = strPath.length();
- if ( len == 1 || (len == 3 && strPath[len - 2] == _T(':')) )
+ if ( len == 1 || (len == 3 && strPath[len - 2] == wxT(':')) )
break;
strPath.Truncate(len - 1);
#ifdef __OS2__
// OS/2 can't handle "d:", it wants either "d:\" or "d:."
- if (strPath.length() == 2 && strPath[1u] == _T(':'))
- strPath << _T('.');
+ if (strPath.length() == 2 && strPath[1u] == wxT(':'))
+ strPath << wxT('.');
#endif
#if defined(__WXPALMOS__)
// stat() can't cope with network paths
DWORD ret = ::GetFileAttributes(strPath.fn_str());
- return (ret != (DWORD)-1) && (ret & FILE_ATTRIBUTE_DIRECTORY);
+ return (ret != INVALID_FILE_ATTRIBUTES) && (ret & FILE_ATTRIBUTE_DIRECTORY);
#elif defined(__OS2__)
FILESTATUS3 Info = {{0}};
APIRET rc = ::DosQueryPathInfo((PSZ)(WXSTRINGCAST strPath), FIL_STANDARD,
#endif // __WIN32__/!__WIN32__
}
+#if WXWIN_COMPATIBILITY_2_8
+
// Get a temporary filename, opening and closing the file.
wxChar *wxGetTempFileName(const wxString& prefix, wxChar *buf)
{
#endif // wxUSE_FILE/!wxUSE_FILE
}
+#endif // #if WXWIN_COMPATIBILITY_2_8
+
// Get first file name matching given wild card.
static wxDir *gs_dir = NULL;
wxString wxFindFirstFile(const wxString& spec, int flags)
{
- wxSplitPath(spec, &gs_dirPath, NULL, NULL);
+ wxFileName::SplitPath(spec, &gs_dirPath, NULL, NULL);
if ( gs_dirPath.empty() )
gs_dirPath = wxT(".");
if ( !wxEndsWithPathSeparator(gs_dirPath ) )
{
#if defined(__WXPALMOS__)
// TODO
- if(buf && sz>0) buf[0] = _T('\0');
+ if(buf && sz>0) buf[0] = wxT('\0');
return buf;
#elif defined(__WXWINCE__)
// TODO
- if(buf && sz>0) buf[0] = _T('\0');
+ if(buf && sz>0) buf[0] = wxT('\0');
return buf;
#else
if ( !buf )
{
sz -= 3;
rc = ::DosQueryCurrentDir( 0 // current drive
- ,cbuf + 3
+ ,(PBYTE)cbuf + 3
,(PULONG)&sz
);
cbuf[0] = char('A' + (ulDriveNum - 1));
// sense at all to me - empty string is a better error indicator
// (NULL might be even better but I'm afraid this could lead to
// problems with the old code assuming the return is never NULL)
- buf[0] = _T('\0');
+ buf[0] = wxT('\0');
}
else // ok, but we might need to massage the path into the right format
{
#if defined(__OS2__)
if (d[1] == ':')
{
- ::DosSetDefaultDisk(wxToupper(d[0]) - _T('A') + 1);
+ ::DosSetDefaultDisk(wxToupper(d[0]) - wxT('A') + 1);
// do not call DosSetCurrentDir when just changing drive,
// since it requires e.g. "d:." instead of "d:"!
if (d.length() == 2)
{
// we assume that it's not empty
wxCHECK_MSG( !szFile.empty(), false,
- _T("empty file name in wxFindFileInPath"));
+ wxT("empty file name in wxFindFileInPath"));
// skip path separator in the beginning of the file name if present
wxString szFile2;
return false;
}
+#if WXWIN_COMPATIBILITY_2_8
void WXDLLIMPEXP_BASE wxSplitPath(const wxString& fileName,
wxString *pstrPath,
wxString *pstrName,
{
wxFileName::SplitPath(fileName, pstrPath, pstrName, pstrExt);
}
+#endif // #if WXWIN_COMPATIBILITY_2_8
#if wxUSE_DATETIME
}
else
{
- wxFAIL_MSG( _T("missing '|' in the wildcard string!") );
+ wxFAIL_MSG( wxT("missing '|' in the wildcard string!") );
}
break;
{
wxString before = descriptions[k].Left(pos);
wxString after = descriptions[k].Mid(pos+filters[k].Len());
- pos = before.Find(_T('('),true);
- if (pos>before.Find(_T(')'),true))
+ pos = before.Find(wxT('('),true);
+ if (pos>before.Find(wxT(')'),true))
{
before = before.Left(pos+1);
before << filters[k];
- pos = after.Find(_T(')'));
- int pos1 = after.Find(_T('('));
+ pos = after.Find(wxT(')'));
+ int pos1 = after.Find(wxT('('));
if (pos != wxNOT_FOUND && (pos<pos1 || pos1==wxNOT_FOUND))
{
before << after.Mid(pos);
// quoting the MSDN: "To obtain a handle to a directory, call the
// CreateFile function with the FILE_FLAG_BACKUP_SEMANTICS flag", but this
// doesn't work under Win9x/ME but then it's not needed there anyhow
- bool isdir = wxDirExists(path);
- if ( isdir && wxGetOsVersion() == wxOS_WINDOWS_9X )
+ const DWORD dwAttr = ::GetFileAttributes(path.fn_str());
+ if ( dwAttr == INVALID_FILE_ATTRIBUTES )
+ {
+ // file probably doesn't exist at all
+ return false;
+ }
+
+ if ( wxGetOsVersion() == wxOS_WINDOWS_9X )
{
// FAT directories always allow all access, even if they have the
- // readonly flag set
- return true;
+ // readonly flag set, and FAT files can only be read-only
+ return (dwAttr & FILE_ATTRIBUTE_DIRECTORY) ||
+ (access != GENERIC_WRITE ||
+ !(dwAttr & FILE_ATTRIBUTE_READONLY));
}
HANDLE h = ::CreateFile
FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
NULL,
OPEN_EXISTING,
- isdir ? FILE_FLAG_BACKUP_SEMANTICS : 0,
+ dwAttr & FILE_ATTRIBUTE_DIRECTORY
+ ? FILE_FLAG_BACKUP_SEMANTICS
+ : 0,
NULL
);
if ( h != INVALID_HANDLE_VALUE )
projects / wxWidgets.git / blobdiff