X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/08942a0c0d68756cf12f98b48387d9a8b323d11c..52069700e7f9c4cc1fc4379306e9f763c5b83073:/src/common/filefn.cpp?ds=inline diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp index dc4910db9a..62dfb206d2 100644 --- a/src/common/filefn.cpp +++ b/src/common/filefn.cpp @@ -6,7 +6,7 @@ // Created: 29/01/98 // RCS-ID: $Id$ // Copyright: (c) 1998 Julian Smart -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "filefn.h" #endif @@ -29,12 +29,11 @@ #pragma hdrstop #endif -#ifndef WX_PRECOMP - #include "wx/defs.h" -#endif - #include "wx/utils.h" #include "wx/intl.h" +#include "wx/file.h" // This does include filefn.h +#include "wx/filename.h" +#include "wx/dir.h" // there are just too many of those... #ifdef __VISUALC__ @@ -51,90 +50,111 @@ #endif #endif -#include - -#ifndef __MWERKS__ - #include - #include -#else - #include - #include +#if defined(__WXMAC__) + #include "wx/mac/private.h" // includes mac headers #endif -#ifdef __UNIX__ - #include - #include -#endif +#include "wx/log.h" -#ifdef __OS2__ - #include - #include +// No, Cygwin doesn't appear to have fnmatch.h after all. +#if defined(HAVE_FNMATCH_H) + #include "fnmatch.h" #endif + #ifdef __WINDOWS__ -#if !defined( __GNUWIN32__ ) && !defined( __MWERKS__ ) && !defined(__SALFORDC__) - #include - #include + #include "wx/msw/wrapwin.h" + #include "wx/msw/mslu.h" + + // sys/cygwin.h is needed for cygwin_conv_to_full_win32_path() + // + // note that it must be included after + #ifdef __GNUWIN32__ + #ifdef __CYGWIN__ + #include + #endif + #endif // __GNUWIN32__ #endif // __WINDOWS__ -#endif // native Win compiler -#ifdef __GNUWIN32__ - #ifndef __TWIN32__ - #include - #endif +// TODO: Borland probably has _wgetcwd as well? +#ifdef _MSC_VER + #define HAVE_WGETCWD #endif -#ifdef __BORLANDC__ // Please someone tell me which version of Borland needs - // this (3.1 I believe) and how to test for it. - // If this works for Borland 4.0 as well, then no worries. - #include +// ---------------------------------------------------------------------------- +// constants +// ---------------------------------------------------------------------------- + +#ifndef _MAXPATHLEN + #define _MAXPATHLEN 1024 #endif -#ifdef __SALFORDC__ - #include - #include +#ifdef __WXMAC__ +# include "MoreFilesX.h" #endif -#include "wx/setup.h" -#include "wx/log.h" +// ---------------------------------------------------------------------------- +// private globals +// ---------------------------------------------------------------------------- -// No, Cygwin doesn't appear to have fnmatch.h after all. -#if defined(HAVE_FNMATCH_H) - #include "fnmatch.h" -#endif +// MT-FIXME: get rid of this horror and all code using it +static wxChar wxFileFunctionsBuffer[4*_MAXPATHLEN]; -#ifdef __WINDOWS__ - #include "windows.h" +#if defined(__VISAGECPP__) && __IBMCPP__ >= 400 +// +// VisualAge C++ V4.0 cannot have any external linkage const decs +// in headers included by more than one primary source +// +const int wxInvalidOffset = -1; #endif // ---------------------------------------------------------------------------- -// constants +// macros // ---------------------------------------------------------------------------- -#define _MAXPATHLEN 500 +// we need to translate Mac filenames before passing them to OS functions +#define OS_FILENAME(s) (s.fn_str()) + +// ============================================================================ +// implementation +// ============================================================================ + +#ifdef wxNEED_WX_UNISTD_H -extern wxChar *wxBuffer; +WXDLLEXPORT int wxStat( const wxChar *file_name, wxStructStat *buf ) +{ + return stat( wxConvFile.cWX2MB( file_name ), buf ); +} -#ifdef __WXMAC__ +WXDLLEXPORT int wxAccess( const wxChar *pathname, int mode ) +{ + return access( wxConvFile.cWX2MB( pathname ), mode ); +} -#include "morefile.h" -#include "moreextr.h" -#include "fullpath.h" -#include "fspcompa.h" -#endif +WXDLLEXPORT int wxOpen( const wxChar *pathname, int flags, mode_t mode ) +{ + return open( wxConvFile.cWX2MB( pathname ), flags, mode ); +} -#if !USE_SHARED_LIBRARIES - IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxStringList) #endif + // wxNEED_WX_UNISTD_H // ---------------------------------------------------------------------------- -// private globals +// wxPathList // ---------------------------------------------------------------------------- -static wxChar wxFileFunctionsBuffer[4*_MAXPATHLEN]; +// IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxStringList) -// ============================================================================ -// implementation -// ============================================================================ +static inline wxChar* MYcopystring(const wxString& s) +{ + wxChar* copy = new wxChar[s.length() + 1]; + return wxStrcpy(copy, s.c_str()); +} + +static inline wxChar* MYcopystring(const wxChar* s) +{ + wxChar* copy = new wxChar[wxStrlen(s) + 1]; + return wxStrcpy(copy, s); +} void wxPathList::Add (const wxString& path) { @@ -144,35 +164,47 @@ void wxPathList::Add (const wxString& path) // Add paths e.g. from the PATH environment variable void wxPathList::AddEnvList (const wxString& envVariable) { - static const wxChar PATH_TOKS[] = -#ifdef __WINDOWS__ - wxT(" ;"); // Don't seperate with colon in DOS (used for drive) + // No environment variables on WinCE +#ifndef __WXWINCE__ + static const wxChar PATH_TOKS[] = +#if defined(__WINDOWS__) || defined(__OS2__) + /* + The space has been removed from the tokenizers, otherwise a + path such as "C:\Program Files" would be split into 2 paths: + "C:\Program" and "Files" + */ +// wxT(" ;"); // Don't seperate with colon in DOS (used for drive) + wxT(";"); // Don't seperate with colon in DOS (used for drive) #else wxT(" :;"); #endif - wxChar *val = wxGetenv (WXSTRINGCAST envVariable); - if (val && *val) + wxChar *val = wxGetenv (WXSTRINGCAST envVariable); + if (val && *val) { - wxChar *s = copystring (val); - wxChar *save_ptr, *token = wxStrtok (s, PATH_TOKS, &save_ptr); + wxChar *s = MYcopystring (val); + wxChar *save_ptr, *token = wxStrtok (s, PATH_TOKS, &save_ptr); - if (token) - { - Add (copystring (token)); - while (token) - { - if ((token = wxStrtok ((wxChar *) NULL, PATH_TOKS, &save_ptr)) != NULL) - Add (wxString(token)); - } - } + if (token) + { + Add(token); + while (token) + { + if ( (token = wxStrtok ((wxChar *) NULL, PATH_TOKS, &save_ptr)) + != NULL ) + { + Add(token); + } + } + } - // suppress warning about unused variable save_ptr when wxStrtok() is a - // macro which throws away its third argument - save_ptr = token; + // suppress warning about unused variable save_ptr when wxStrtok() is a + // macro which throws away its third argument + save_ptr = token; - delete [] s; + delete [] s; } +#endif } // Given a full filename (with path), ensure that that file can @@ -181,7 +213,7 @@ void wxPathList::AddEnvList (const wxString& envVariable) void wxPathList::EnsureFileAccessible (const wxString& path) { wxString path_only(wxPathOnly(path)); - if ( !path_only.IsEmpty() ) + if ( !path_only.empty() ) { if ( !Member(path_only) ) Add(path_only); @@ -190,11 +222,11 @@ void wxPathList::EnsureFileAccessible (const wxString& path) bool wxPathList::Member (const wxString& path) { - for (wxNode * node = First (); node != NULL; node = node->Next ()) + for (wxStringList::compatibility_iterator node = GetFirst(); node; node = node->GetNext()) { - wxString path2((wxChar *) node->Data ()); + wxString path2( node->GetData() ); if ( -#if defined(__WINDOWS__) || defined(__VMS__) || defined (__WXMAC__) +#if defined(__WINDOWS__) || defined(__OS2__) || defined(__VMS__) || defined (__WXMAC__) // Case INDEPENDENT path.CompareTo (path2, wxString::ignoreCase) == 0 #else @@ -202,9 +234,9 @@ bool wxPathList::Member (const wxString& path) path.CompareTo (path2) == 0 #endif ) - return TRUE; + return true; } - return FALSE; + return false; } wxString wxPathList::FindValidPath (const wxString& file) @@ -215,19 +247,18 @@ wxString wxPathList::FindValidPath (const wxString& file) wxChar buf[_MAXPATHLEN]; wxStrcpy(buf, wxFileFunctionsBuffer); - wxChar *filename = (wxChar*) NULL; /* shut up buggy egcs warning */ - filename = IsAbsolutePath (buf) ? wxFileNameFromPath (buf) : (wxChar *)buf; + wxChar *filename = wxIsAbsolutePath (buf) ? wxFileNameFromPath (buf) : (wxChar *)buf; - for (wxNode * node = First (); node; node = node->Next ()) + for (wxStringList::compatibility_iterator node = GetFirst(); node; node = node->GetNext()) { - wxChar *path = (wxChar *) node->Data (); + const wxChar *path = node->GetData(); wxStrcpy (wxFileFunctionsBuffer, path); wxChar ch = wxFileFunctionsBuffer[wxStrlen(wxFileFunctionsBuffer)-1]; if (ch != wxT('\\') && ch != wxT('/')) wxStrcat (wxFileFunctionsBuffer, wxT("/")); wxStrcat (wxFileFunctionsBuffer, filename); #ifdef __WINDOWS__ - Unix2DosFilename (wxFileFunctionsBuffer); + wxUnix2DosFilename (wxFileFunctionsBuffer); #endif if (wxFileExists (wxFileFunctionsBuffer)) { @@ -235,18 +266,18 @@ wxString wxPathList::FindValidPath (const wxString& file) } } // for() - return wxString(wxT("")); // Not found + return wxEmptyString; // Not found } wxString wxPathList::FindAbsoluteValidPath (const wxString& file) { wxString f = FindValidPath(file); - if ( wxIsAbsolutePath(f) ) + if ( f.empty() || wxIsAbsolutePath(f) ) return f; wxString buf; - wxGetWorkingDirectory(buf.GetWriteBuf(_MAXPATHLEN), _MAXPATHLEN - 1); - buf.UngetWriteBuf(); + wxGetWorkingDirectory(wxStringBuffer(buf, _MAXPATHLEN), _MAXPATHLEN); + if ( !wxEndsWithPathSeparator(buf) ) { buf += wxFILE_SEP_PATH; @@ -259,59 +290,52 @@ wxString wxPathList::FindAbsoluteValidPath (const wxString& file) bool wxFileExists (const wxString& filename) { -#ifdef __GNUWIN32__ // (fix a B20 bug) - if (GetFileAttributes(filename) == 0xFFFFFFFF) - return FALSE; - else - return TRUE; -#elif defined(__WXMAC__) - struct stat stbuf; - if (filename && stat (wxUnix2MacFilename(filename), &stbuf) == 0 ) - return TRUE; - return FALSE ; -#else - -#ifdef __SALFORDC__ - struct _stat stbuf; + // we must use GetFileAttributes() instead of the ANSI C functions because + // it can cope with network (UNC) paths unlike them +#if defined(__WIN32__) && !defined(__WXMICROWIN__) + DWORD ret = ::GetFileAttributes(filename); + + return (ret != (DWORD)-1) && !(ret & FILE_ATTRIBUTE_DIRECTORY); +#else // !__WIN32__ + wxStructStat st; +#ifndef wxNEED_WX_UNISTD_H + return wxStat( filename.fn_str() , &st) == 0 && (st.st_mode & S_IFREG); #else - struct stat stbuf; -#endif - - if ((filename != wxT("")) && stat (wxFNSTRINGCAST filename.fn_str(), &stbuf) == 0) - return TRUE; - return FALSE; + return wxStat( filename , &st) == 0 && (st.st_mode & S_IFREG); #endif +#endif // __WIN32__/!__WIN32__ } -/* Vadim's alternative implementation - -// does the file exist? -bool wxFileExists(const char *pszFileName) -{ - struct stat st; - return !access(pszFileName, 0) && - !stat(pszFileName, &st) && - (st.st_mode & S_IFREG); -} -*/ - bool wxIsAbsolutePath (const wxString& filename) { - if (filename != wxT("")) + if (filename != wxT("")) { - if (filename[0] == wxT('/') +#if defined(__WXMAC__) && !defined(__DARWIN__) + // Classic or Carbon CodeWarrior like + // Carbon with Apple DevTools is Unix like + + // This seems wrong to me, but there is no fix. since + // "MacOS:MyText.txt" is absolute whereas "MyDir:MyText.txt" + // is not. Or maybe ":MyDir:MyText.txt" has to be used? RR. + if (filename.Find(':') != wxNOT_FOUND && filename[0] != ':') + return true ; +#else + // Unix like or Windows + if (filename[0] == wxT('/')) + return true; +#endif #ifdef __VMS__ - || (filename[0] == wxT('[') && filename[1] != wxT('.')) + if ((filename[0] == wxT('[') && filename[1] != wxT('.'))) + return true; #endif -#ifdef __WINDOWS__ - /* MSDOS */ - || filename[0] == wxT('\\') || (wxIsalpha (filename[0]) && filename[1] == wxT(':')) +#if defined(__WINDOWS__) || defined(__OS2__) + // MSDOS like + if (filename[0] == wxT('\\') || (wxIsalpha (filename[0]) && filename[1] == wxT(':'))) + return true; #endif - ) - return TRUE; } - return FALSE; + return false ; } /* @@ -337,17 +361,16 @@ void wxStripExtension(wxChar *buffer) void wxStripExtension(wxString& buffer) { - size_t len = buffer.Length(); - size_t i = len-1; - while (i > 0) - { - if (buffer.GetChar(i) == wxT('.')) + //RN: Be careful about the handling the case where + //buffer.Length() == 0 + for(size_t i = buffer.Length() - 1; i != wxString::npos; --i) { - buffer = buffer.Left(i); - break; + if (buffer.GetChar(i) == wxT('.')) + { + buffer = buffer.Left(i); + break; + } } - i --; - } } // Destructive removal of /./ and /../ stuff @@ -355,7 +378,7 @@ wxChar *wxRealPath (wxChar *path) { #ifdef __WXMSW__ static const wxChar SEP = wxT('\\'); - Unix2DosFilename(path); + wxUnix2DosFilename(path); #else static const wxChar SEP = wxT('/'); #endif @@ -373,7 +396,11 @@ wxChar *wxRealPath (wxChar *path) if (p[1] == wxT('.') && p[2] == wxT('.') && (p[3] == SEP || p[3] == wxT('\0'))) { wxChar *q; - for (q = p - 1; q >= path && *q != SEP; q--); + for (q = p - 1; q >= path && *q != SEP; q--) + { + // Empty + } + if (q[0] == SEP && (q[1] != wxT('.') || q[2] != wxT('.') || q[3] != SEP) && (q - 1 <= path || q[-1] != SEP)) { @@ -383,7 +410,7 @@ wxChar *wxRealPath (wxChar *path) path[0] = SEP; path[1] = wxT('\0'); } -#ifdef __WXMSW__ +#if defined(__WXMSW__) || defined(__OS2__) /* Check that path[2] is NULL! */ else if (path[1] == wxT(':') && !path[2]) { @@ -408,7 +435,7 @@ wxChar *wxCopyAbsolutePath(const wxString& filename) if (filename == wxT("")) return (wxChar *) NULL; - if (! IsAbsolutePath(wxExpandPath(wxFileFunctionsBuffer, filename))) { + if (! wxIsAbsolutePath(wxExpandPath(wxFileFunctionsBuffer, filename))) { wxChar buf[_MAXPATHLEN]; buf[0] = wxT('\0'); wxGetWorkingDirectory(buf, WXSIZEOF(buf)); @@ -421,9 +448,9 @@ wxChar *wxCopyAbsolutePath(const wxString& filename) wxStrcat(buf, wxT("/")); #endif wxStrcat(buf, wxFileFunctionsBuffer); - return copystring( wxRealPath(buf) ); + return MYcopystring( wxRealPath(buf) ); } - return copystring( wxFileFunctionsBuffer ); + return MYcopystring( wxFileFunctionsBuffer ); } /*- @@ -453,7 +480,7 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name) { 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"); @@ -465,14 +492,14 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name) trimchars[3] = 0; #ifdef __WXMSW__ - const wxChar SEP = wxT('\\'); + const wxChar SEP = wxT('\\'); #else - const wxChar SEP = wxT('/'); + const wxChar SEP = wxT('/'); #endif buf[0] = wxT('\0'); if (name == NULL || *name == wxT('\0')) return buf; - nm = copystring(name); // Make a scratch copy + nm = MYcopystring(name); // Make a scratch copy wxChar *nm_tmp = nm; /* Skip leading whitespace and cr */ @@ -509,7 +536,7 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name) } else #else - while ((*d++ = *s)) { + while ((*d++ = *s) != 0) { # ifndef __WXMSW__ if (*s == wxT('\\')) { if ((*(d - 1) = *++s)) { @@ -520,6 +547,8 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name) } else # endif #endif + // No env variables on WinCE +#ifndef __WXWINCE__ #ifdef __WXMSW__ if (*s++ == wxT('$') && (*s == wxT('{') || *s == wxT(')'))) #else @@ -529,13 +558,7 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name) 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) != 0) if (braces ? (*s == wxT('}') || *s == wxT(')')) : !(wxIsalnum(*s) || *s == wxT('_')) ) break; else @@ -543,28 +566,28 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name) *--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++) != 0;) + { + // Empty + } + d--; if (braces && *s) s++; } } +#endif + // __WXWINCE__ } /* Expand ~ and ~user */ nm = lnm; - s = wxT(""); if (nm[0] == wxT('~') && !q) { /* prefix ~ */ if (nm[1] == SEP || nm[1] == 0) { /* ~/filename */ - // FIXME: wxGetUserHome could return temporary storage in Unicode mode + // FIXME: wxGetUserHome could return temporary storage in Unicode mode if ((s = WXSTRINGCAST wxGetUserHome(wxT(""))) != NULL) { if (*++nm) nm++; @@ -573,16 +596,19 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name) { /* ~user/filename */ register wxChar *nnm; register wxChar *home; - for (s = nm; *s && *s != SEP; s++); + for (s = nm; *s && *s != SEP; s++) + { + // Empty + } int was_sep; /* MATTHEW: Was there a separator, or NULL? */ was_sep = (*s == SEP); nnm = *s ? s + 1 : s; *s = 0; - // FIXME: wxGetUserHome could return temporary storage in Unicode mode + // FIXME: wxGetUserHome could return temporary storage in Unicode mode if ((home = WXSTRINGCAST wxGetUserHome(wxString(nm + 1))) == NULL) { if (was_sep) /* replace only if it was there: */ *s = SEP; - s = wxT(""); + s = NULL; } else { nm = nnm; s = home; @@ -600,19 +626,15 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name) *(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++) != 0) + { + // Empty + } delete[] nm_tmp; // clean up alloc /* Now clean up the buffer */ return wxRealPath(buf); } - /* Contract Paths to be build upon an environment variable component: @@ -630,12 +652,13 @@ wxContractPath (const wxString& filename, const wxString& envname, const wxStrin wxStrcpy (dest, WXSTRINGCAST filename); #ifdef __WXMSW__ - Unix2DosFilename(dest); + wxUnix2DosFilename(dest); #endif // Handle environment - const wxChar *val = (const wxChar *) NULL; - wxChar *tcp = (wxChar *) NULL; + const wxChar *val; +#ifndef __WXWINCE__ + wxChar *tcp; if (envname != WXSTRINGCAST NULL && (val = wxGetenv (WXSTRINGCAST envname)) != NULL && (tcp = wxStrstr (dest, val)) != NULL) { @@ -646,313 +669,266 @@ wxContractPath (const wxString& filename, const wxString& envname, const wxStrin wxStrcat (tcp, wxT("}")); wxStrcat (tcp, wxFileFunctionsBuffer); } +#endif // Handle User's home (ignore root homes!) - size_t len = 0; - if ((val = wxGetUserHome (user)) != NULL && - (len = wxStrlen(val)) > 2 && - wxStrncmp(dest, val, len) == 0) - { - wxStrcpy(wxFileFunctionsBuffer, wxT("~")); - if (user != wxT("")) - wxStrcat(wxFileFunctionsBuffer, (const wxChar*) user); -#ifdef __WXMSW__ -// strcat(wxFileFunctionsBuffer, "\\"); -#else -// strcat(wxFileFunctionsBuffer, "/"); -#endif - wxStrcat(wxFileFunctionsBuffer, dest + len); - wxStrcpy (dest, wxFileFunctionsBuffer); - } + val = wxGetUserHome (user); + if (!val) + return dest; + + const size_t len = wxStrlen(val); + if (len <= 2) + return dest; + + if (wxStrncmp(dest, val, len) == 0) + { + wxStrcpy(wxFileFunctionsBuffer, wxT("~")); + if (user != wxT("")) + wxStrcat(wxFileFunctionsBuffer, (const wxChar*) user); + wxStrcat(wxFileFunctionsBuffer, dest + len); + wxStrcpy (dest, wxFileFunctionsBuffer); + } return dest; } -// Return just the filename, not the path -// (basename) +// Return just the filename, not the path (basename) wxChar *wxFileNameFromPath (wxChar *path) { - if (path) - { - register wxChar *tcp; + wxString p = path; + wxString n = wxFileNameFromPath(p); - tcp = path + wxStrlen (path); - while (--tcp >= path) - { - if (*tcp == wxT('/') || *tcp == wxT('\\') -#ifdef __VMS__ - || *tcp == wxT(':') || *tcp == wxT(']')) -#else - ) -#endif - return tcp + 1; - } /* while */ -#if defined(__WXMSW__) || defined(__WXPM__) - if (wxIsalpha (*path) && *(path + 1) == wxT(':')) - return path + 2; -#endif - } - return path; + return path + p.length() - n.length(); } -wxString wxFileNameFromPath (const wxString& path1) +wxString wxFileNameFromPath (const wxString& path) { - if (path1 != wxT("")) - { - - wxChar *path = WXSTRINGCAST path1 ; - register wxChar *tcp; + wxString name, ext; + wxFileName::SplitPath(path, NULL, &name, &ext); - tcp = path + wxStrlen (path); - while (--tcp >= path) - { - if (*tcp == wxT('/') || *tcp == wxT('\\') -#ifdef __VMS__ - || *tcp == wxT(':') || *tcp == wxT(']')) -#else - ) -#endif - return wxString(tcp + 1); - } /* while */ -#if defined(__WXMSW__) || defined(__WXPM__) - if (wxIsalpha (*path) && *(path + 1) == wxT(':')) - return wxString(path + 2); -#endif + wxString fullname = name; + if ( !ext.empty() ) + { + fullname << wxFILE_SEP_EXT << ext; } - // Yes, this should return the path, not an empty string, otherwise - // we get "thing.txt" -> "". - return path1; + + return fullname; } // Return just the directory, or NULL if no directory wxChar * wxPathOnly (wxChar *path) { - if (path && *path) + if (path && *path) { - static wxChar buf[_MAXPATHLEN]; + static wxChar buf[_MAXPATHLEN]; - // Local copy - wxStrcpy (buf, path); + // Local copy + wxStrcpy (buf, path); - int l = wxStrlen(path); - bool done = FALSE; + int l = wxStrlen(path); + int i = l - 1; - int i = l - 1; - - // Search backward for a backward or forward slash - while (!done && i > -1) - { - // ] is for VMS - if (path[i] == wxT('/') || path[i] == wxT('\\') || path[i] == wxT(']')) + // Search backward for a backward or forward slash + while (i > -1) { - done = TRUE; -#ifdef __VMS__ - buf[i+1] = 0; +#if defined(__WXMAC__) && !defined(__DARWIN__) + // Classic or Carbon CodeWarrior like + // Carbon with Apple DevTools is Unix like + if (path[i] == wxT(':') ) + { + buf[i] = 0; + return buf; + } #else - buf[i] = 0; + // Unix like or Windows + if (path[i] == wxT('/') || path[i] == wxT('\\')) + { + buf[i] = 0; + return buf; + } #endif - - return buf; +#ifdef __VMS__ + if (path[i] == wxT(']')) + { + buf[i+1] = 0; + return buf; + } +#endif + i --; } - else i --; - } -#if defined(__WXMSW__) || defined(__WXPM__) - // Try Drive specifier - if (wxIsalpha (buf[0]) && buf[1] == wxT(':')) +#if defined(__WXMSW__) || defined(__OS2__) + // Try Drive specifier + if (wxIsalpha (buf[0]) && buf[1] == wxT(':')) { - // A:junk --> A:. (since A:.\junk Not A:\junk) - buf[2] = wxT('.'); - buf[3] = wxT('\0'); - return buf; + // A:junk --> A:. (since A:.\junk Not A:\junk) + buf[2] = wxT('.'); + buf[3] = wxT('\0'); + return buf; } #endif } - - return (wxChar *) NULL; + return (wxChar *) NULL; } // Return just the directory, or NULL if no directory wxString wxPathOnly (const wxString& path) { - if (path != wxT("")) + if (path != wxT("")) { - wxChar buf[_MAXPATHLEN]; - - // Local copy - wxStrcpy (buf, WXSTRINGCAST path); + wxChar buf[_MAXPATHLEN]; - int l = path.Length(); - bool done = FALSE; + // Local copy + wxStrcpy (buf, WXSTRINGCAST path); - int i = l - 1; + int l = path.Length(); + int i = l - 1; - // Search backward for a backward or forward slash - while (!done && i > -1) - { - // ] is for VMS - if (path[i] == wxT('/') || path[i] == wxT('\\') || path[i] == wxT(']')) + // Search backward for a backward or forward slash + while (i > -1) { - done = TRUE; -#ifdef __VMS__ - buf[i+1] = 0; +#if defined(__WXMAC__) && !defined(__DARWIN__) + // Classic or Carbon CodeWarrior like + // Carbon with Apple DevTools is Unix like + if (path[i] == wxT(':') ) + { + buf[i] = 0; + return wxString(buf); + } #else - buf[i] = 0; + // Unix like or Windows + if (path[i] == wxT('/') || path[i] == wxT('\\')) + { + // Don't return an empty string + if (i == 0) + i ++; + buf[i] = 0; + return wxString(buf); + } #endif - - return wxString(buf); +#ifdef __VMS__ + if (path[i] == wxT(']')) + { + buf[i+1] = 0; + return wxString(buf); + } +#endif + i --; } - else i --; - } -#if defined(__WXMSW__) || defined(__WXPM__) - // Try Drive specifier - if (wxIsalpha (buf[0]) && buf[1] == wxT(':')) +#if defined(__WXMSW__) || defined(__OS2__) + // Try Drive specifier + if (wxIsalpha (buf[0]) && buf[1] == wxT(':')) { - // A:junk --> A:. (since A:.\junk Not A:\junk) - buf[2] = wxT('.'); - buf[3] = wxT('\0'); - return wxString(buf); + // A:junk --> A:. (since A:.\junk Not A:\junk) + buf[2] = wxT('.'); + buf[3] = wxT('\0'); + return wxString(buf); } #endif } - - return wxString(wxT("")); + return wxString(wxT("")); } // Utility for converting delimiters in DOS filenames to UNIX style // 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__) -static char sMacFileNameConversion[ 1000 ] ; +#if TARGET_API_MAC_OSX +#define kDefaultPathStyle kCFURLPOSIXPathStyle +#else +#define kDefaultPathStyle kCFURLHFSPathStyle +#endif -wxString wxMac2UnixFilename (const char *str) +wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef additionalPathComponent ) { - char *s = sMacFileNameConversion ; - strcpy( s , str ) ; - if (s) - { - memmove( s+1 , s ,strlen( s ) + 1) ; - if ( *s == ':' ) - *s = '.' ; - else - *s = '/' ; - - while (*s) + CFURLRef fullURLRef; + fullURLRef = CFURLCreateFromFSRef(NULL, fsRef); + if ( additionalPathComponent ) { - if (*s == ':') - *s = '/'; - else - *s = wxTolower (*s); // Case INDEPENDENT - s++; + CFURLRef parentURLRef = fullURLRef ; + fullURLRef = CFURLCreateCopyAppendingPathComponent(NULL, parentURLRef, + additionalPathComponent,false); + CFRelease( parentURLRef ) ; } - } - return wxString (sMacFileNameConversion) ; + CFStringRef cfString = CFURLCopyFileSystemPath(fullURLRef, kDefaultPathStyle); + CFRelease( fullURLRef ) ; + return wxMacCFStringHolder(cfString).AsString(wxLocale::GetSystemEncoding()); } -wxString wxUnix2MacFilename (const char *str) +OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef ) { - char *s = sMacFileNameConversion ; - strcpy( s , str ) ; - if (s) - { - if ( *s == '.' ) - { - // relative path , since it goes on with slash which is translated to a : - memmove( s , s+1 ,strlen( s ) ) ; - } - else if ( *s == '/' ) + OSStatus err = noErr ; + CFURLRef url = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, wxMacCFStringHolder(path ,wxLocale::GetSystemEncoding() ) , kDefaultPathStyle, false); + if ( NULL != url ) { - // absolute path -> on mac just start with the drive name - memmove( s , s+1 ,strlen( s ) ) ; + if ( CFURLGetFSRef(url, fsRef) == false ) + err = fnfErr ; + CFRelease( url ) ; } else { - wxASSERT_MSG( 1 , "unkown path beginning" ) ; - } - while (*s) - { - if (*s == '/' || *s == '\\') - { - // convert any back-directory situations - if ( *(s+1) == '.' && *(s+2) == '.' && ( (*(s+3) == '/' || *(s+3) == '\\') ) ) - { - *s = ':'; - memmove( s+1 , s+3 ,strlen( s+3 ) + 1 ) ; - } - else - *s = ':'; - } - - s++ ; + err = fnfErr ; } - } - return wxString (sMacFileNameConversion) ; + return err ; } -wxString wxMacFSSpec2MacFilename( const FSSpec *spec ) +wxString wxMacHFSUniStrToString( ConstHFSUniStr255Param uniname ) { - Handle myPath ; - short length ; - - FSpGetFullPath( spec , &length , &myPath ) ; - ::SetHandleSize( myPath , length + 1 ) ; - ::HLock( myPath ) ; - (*myPath)[length] = 0 ; - if ( length > 0 && (*myPath)[length-1] ==':' ) - (*myPath)[length-1] = 0 ; - - wxString result( (char*) *myPath ) ; - ::HUnlock( myPath ) ; - ::DisposeHandle( myPath ) ; - return result ; + CFStringRef cfname = CFStringCreateWithCharacters( kCFAllocatorDefault, + uniname->unicode, + uniname->length ); + return wxMacCFStringHolder(cfname).AsString() ; } -wxString wxMacFSSpec2UnixFilename( const FSSpec *spec ) +wxString wxMacFSSpec2MacFilename( const FSSpec *spec ) { - return wxMac2UnixFilename( wxMacFSSpec2MacFilename( spec) ) ; + FSRef fsRef ; + if ( FSpMakeFSRef( spec , &fsRef) == noErr ) + { + return wxMacFSRefToPath( &fsRef ) ; + } + return wxEmptyString ; } -void wxMacFilename2FSSpec( const char *path , FSSpec *spec ) +void wxMacFilename2FSSpec( const wxString& path , FSSpec *spec ) { - FSpLocationFromFullPath( strlen(path ) , path , spec ) ; + OSStatus err = noErr ; + FSRef fsRef ; + wxMacPathToFSRef( path , &fsRef ) ; + err = FSRefMakeFSSpec( &fsRef , spec ) ; } -void wxUnixFilename2FSSpec( const char *path , FSSpec *spec ) -{ - wxString var = wxUnix2MacFilename( path ) ; - wxMacFilename2FSSpec( var , spec ) ; -} +#endif // __WXMAC__ -#endif void -wxDos2UnixFilename (char *s) +wxDos2UnixFilename (wxChar *s) { if (s) while (*s) { - if (*s == '\\') - *s = '/'; + if (*s == _T('\\')) + *s = _T('/'); #ifdef __WXMSW__ else - *s = wxTolower (*s); // Case INDEPENDENT + *s = (wxChar)wxTolower (*s); // Case INDEPENDENT #endif s++; } } void -#if defined(__WXMSW__) || defined(__WXPM__) -wxUnix2DosFilename (char *s) +#if defined(__WXMSW__) || defined(__OS2__) +wxUnix2DosFilename (wxChar *s) #else -wxUnix2DosFilename (char *WXUNUSED(s) ) +wxUnix2DosFilename (wxChar *WXUNUSED(s) ) #endif { // Yes, I really mean this to happen under DOS only! JACS -#if defined(__WXMSW__) || defined(__WXPM__) +#if defined(__WXMSW__) || defined(__OS2__) if (s) while (*s) { @@ -967,21 +943,17 @@ wxUnix2DosFilename (char *WXUNUSED(s) ) bool wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& file3) { - wxChar *outfile = wxGetTempFileName("cat"); + wxString outfile; + if ( !wxGetTempFileName( wxT("cat"), outfile) ) + return false; - FILE *fp1 = (FILE *) NULL; - FILE *fp2 = (FILE *) NULL; - FILE *fp3 = (FILE *) NULL; + FILE *fp1 wxDUMMY_INITIALIZE(NULL); + FILE *fp2 = NULL; + FILE *fp3 = NULL; // Open the inputs and outputs -#ifdef __WXMAC__ - if ((fp1 = fopen (wxUnix2MacFilename( file1 ), "rb")) == NULL || - (fp2 = fopen (wxUnix2MacFilename( file2 ), "rb")) == NULL || - (fp3 = fopen (wxUnix2MacFilename( outfile ), "wb")) == NULL) -#else - if ((fp1 = wxFopen (WXSTRINGCAST file1, wxT("rb"))) == NULL || - (fp2 = wxFopen (WXSTRINGCAST file2, wxT("rb"))) == NULL || - (fp3 = wxFopen (outfile, wxT("wb"))) == NULL) -#endif + if ((fp1 = wxFopen ( file1, wxT("rb"))) == NULL || + (fp2 = wxFopen ( file2, wxT("rb"))) == NULL || + (fp3 = wxFopen ( outfile, wxT("wb"))) == NULL) { if (fp1) fclose (fp1); @@ -989,7 +961,7 @@ wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& fil fclose (fp2); if (fp3) fclose (fp3); - return FALSE; + return false; } int ch; @@ -1003,678 +975,499 @@ wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& fil fclose (fp3); bool result = wxRenameFile(outfile, file3); - delete[] outfile; return result; } // Copy files bool -wxCopyFile (const wxString& file1, const wxString& file2) +wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite) { - FILE *fd1; - FILE *fd2; - int ch; +#if defined(__WIN32__) && !defined(__WXMICROWIN__) + // 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 + if ( !::CopyFile(file1, file2, !overwrite) ) + { + wxLogSysError(_("Failed to copy the file '%s' to '%s'"), + file1.c_str(), file2.c_str()); -#ifdef __WXMAC__ - if ((fd1 = fopen (wxUnix2MacFilename( file1 ), "rb")) == NULL) - return FALSE; - if ((fd2 = fopen (wxUnix2MacFilename( file2 ), "wb")) == NULL) -#else - if ((fd1 = wxFopen (WXSTRINGCAST file1, wxT("rb"))) == NULL) - return FALSE; - if ((fd2 = wxFopen (WXSTRINGCAST file2, wxT("wb"))) == NULL) -#endif + return false; + } +#elif defined(__OS2__) + if ( ::DosCopy(file2, file2, overwrite ? DCPY_EXISTING : 0) != 0 ) + return false; +#else // !Win32 + + wxStructStat fbuf; + // get permissions of file1 + if ( wxStat( file1.c_str(), &fbuf) != 0 ) + { + // the file probably doesn't exist or we haven't the rights to read + // from it anyhow + wxLogSysError(_("Impossible to get permissions for file '%s'"), + file1.c_str()); + return false; + } + + // open file1 for reading + wxFile fileIn(file1, wxFile::read); + if ( !fileIn.IsOpened() ) + return false; + + // remove file2, if it exists. This is needed for creating + // file2 with the correct permissions in the next step + if ( wxFileExists(file2) && (!overwrite || !wxRemoveFile(file2))) + { + wxLogSysError(_("Impossible to overwrite the file '%s'"), + file2.c_str()); + return false; + } + + // reset the umask as we want to create the file with exactly the same + // permissions as the original one + wxCHANGE_UMASK(0); + + // create file2 with the same permissions than file1 and open it for + // writing + + wxFile fileOut; + if ( !fileOut.Create(file2, overwrite, fbuf.st_mode & 0777) ) + return false; + + // copy contents of file1 to file2 + char buf[4096]; + size_t count; + for ( ;; ) { - fclose (fd1); - return FALSE; + count = fileIn.Read(buf, WXSIZEOF(buf)); + if ( fileIn.Error() ) + return false; + + // end of file? + if ( !count ) + break; + + if ( fileOut.Write(buf, count) < count ) + return false; } - while ((ch = getc (fd1)) != EOF) - (void) putc (ch, fd2); + // 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 // OS/2 || Mac +#endif // __WXMSW__ && __WIN32__ - fclose (fd1); - fclose (fd2); - return TRUE; + return true; } bool wxRenameFile (const wxString& file1, const wxString& file2) { -#ifdef __WXMAC__ - if (0 == rename (wxUnix2MacFilename( file1 ), wxUnix2MacFilename( file2 ))) - return TRUE; -#else - // Normal system call - if (0 == rename (wxFNSTRINGCAST file1.fn_str(), wxFNSTRINGCAST file2.fn_str())) - return TRUE; +#ifndef __WXWINCE__ + // Normal system call + if ( wxRename (file1, file2) == 0 ) + return true; #endif + // Try to copy if (wxCopyFile(file1, file2)) { wxRemoveFile(file1); - return TRUE; + return true; } // Give up - return FALSE; + return false; } bool wxRemoveFile(const wxString& file) { -#if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__WATCOMC__) - int flag = remove(wxFNSTRINGCAST file.fn_str()); -#elif defined( __WXMAC__ ) - int flag = unlink(wxUnix2MacFilename( file )); +#if defined(__VISUALC__) \ + || defined(__BORLANDC__) \ + || defined(__WATCOMC__) \ + || defined(__DMC__) \ + || defined(__GNUWIN32__) \ + || (defined(__MWERKS__) && defined(__MSL__)) + int res = wxRemove(file); +#elif defined(__WXMAC__) + int res = unlink(wxFNCONV(file)); #else - int flag = unlink(wxFNSTRINGCAST file.fn_str()); + int res = unlink(OS_FILENAME(file)); #endif - return (flag == 0) ; + + return res == 0; } bool wxMkdir(const wxString& dir, int perm) { -#if defined( __WXMAC__ ) - return (mkdir(wxUnix2MacFilename( dir ) , 0 ) == 0); +#if defined(__WXMAC__) && !defined(__UNIX__) + return (mkdir( wxFNCONV(dir) , 0 ) == 0); #else // !Mac const wxChar *dirname = dir.c_str(); // assume mkdir() has 2 args on non Windows-OS/2 platforms and on Windows too // for the GNU compiler -#if (!(defined(__WXMSW__) || defined(__WXPM__))) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) || defined(__WXWINE__) +#if (!(defined(__WXMSW__) || defined(__OS2__) || defined(__DOS__))) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) || defined(__WINE__) || defined(__WXMICROWIN__) + #if defined(MSVCRT) + wxUnusedVar(perm); + if ( mkdir(wxFNCONV(dirname)) != 0 ) + #else + if ( mkdir(wxFNCONV(dirname), perm) != 0 ) + #endif +#elif defined(__OS2__) + if (::DosCreateDir((PSZ)dirname, NULL) != 0) // enhance for EAB's?? +#elif defined(__DOS__) + #if defined(__WATCOMC__) + (void)perm; + if ( wxMkDir(wxFNSTRINGCAST wxFNCONV(dirname)) != 0 ) + #elif defined(__DJGPP__) if ( mkdir(wxFNCONV(dirname), perm) != 0 ) -#else // MSW and OS/2 - if ( mkdir(wxFNSTRINGCAST wxFNCONV(dirname)) != 0 ) + #else + #error "Unsupported DOS compiler!" + #endif +#else // !MSW, !DOS and !OS/2 VAC++ + wxUnusedVar(perm); +#ifdef __WXWINCE__ + if ( !CreateDirectory(dirname, NULL) ) +#else + if ( wxMkDir(dir.fn_str()) != 0 ) +#endif #endif // !MSW/MSW { wxLogSysError(_("Directory '%s' couldn't be created"), dirname); - return FALSE; + return false; } - return TRUE; + return true; #endif // Mac/!Mac } bool wxRmdir(const wxString& dir, int WXUNUSED(flags)) { #ifdef __VMS__ - return FALSE; //to be changed since rmdir exists in VMS7.x -#elif defined( __WXMAC__ ) - return (rmdir(wxUnix2MacFilename( dir )) == 0); + return false; //to be changed since rmdir exists in VMS7.x +#elif defined(__OS2__) + return (::DosDeleteDir((PSZ)dir.c_str()) == 0); #else -#ifdef __SALFORDC__ - return FALSE; // What to do? +#ifdef __WXWINCE__ + return (CreateDirectory(dir, NULL) != 0); #else - return (rmdir(wxFNSTRINGCAST dir.fn_str()) == 0); + return (wxRmDir(OS_FILENAME(dir)) == 0); #endif #endif } -#if 0 -bool wxDirExists(const wxString& dir) +// does the path exists? (may have or not '/' or '\\' at the end) +bool wxPathExists(const wxChar *pszPathName) { -#ifdef __VMS__ - return FALSE; //To be changed since stat exists in VMS7.x -#elif !defined(__WXMSW__) - struct stat sbuf; - return (stat(dir.fn_str(), &sbuf) != -1) && S_ISDIR(sbuf.st_mode) ? TRUE : FALSE; -#else + wxString strPath(pszPathName); - /* MATTHEW: [6] Always use same code for Win32, call FindClose */ -#if defined(__WIN32__) - WIN32_FIND_DATA fileInfo; -#else -#ifdef __BORLANDC__ - struct ffblk fileInfo; -#else - struct find_t fileInfo; -#endif -#endif +#if defined(__WINDOWS__) || defined(__OS2__) + // Windows fails to find directory named "c:\dir\" even if "c:\dir" exists, + // so remove all trailing backslashes from the path - but don't do this for + // the pathes "d:\" (which are different from "d:") nor for just "\" + while ( wxEndsWithPathSeparator(strPath) ) + { + size_t len = strPath.length(); + if ( len == 1 || (len == 3 && strPath[len - 2] == _T(':')) ) + break; -#if defined(__WIN32__) - HANDLE h = FindFirstFile((LPTSTR) WXSTRINGCAST dir,(LPWIN32_FIND_DATA)&fileInfo); + strPath.Truncate(len - 1); + } +#endif // __WINDOWS__ - if (h==INVALID_HANDLE_VALUE) - return FALSE; - else { - FindClose(h); - return ((fileInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == FILE_ATTRIBUTE_DIRECTORY); - } -#else - // In Borland findfirst has a different argument - // ordering from _dos_findfirst. But _dos_findfirst - // _should_ be ok in both MS and Borland... why not? -#ifdef __BORLANDC__ - return ((findfirst(WXSTRINGCAST dir, &fileInfo, _A_SUBDIR) == 0 && (fileInfo.ff_attrib & _A_SUBDIR) != 0)); -#else - return (((_dos_findfirst(WXSTRINGCAST dir, _A_SUBDIR, &fileInfo) == 0) && (fileInfo.attrib & _A_SUBDIR)) != 0); -#endif +#ifdef __OS2__ + // OS/2 can't handle "d:", it wants either "d:\" or "d:." + if (strPath.length() == 2 && strPath[1u] == _T(':')) + strPath << _T('.'); #endif -#endif -} +#if defined(__WIN32__) && !defined(__WXMICROWIN__) + // stat() can't cope with network paths + DWORD ret = ::GetFileAttributes(strPath); -#endif + return (ret != (DWORD)-1) && (ret & FILE_ATTRIBUTE_DIRECTORY); +#else // !__WIN32__ -// does the path exists? (may have or not '/' or '\\' at the end) -bool wxPathExists(const wxChar *pszPathName) -{ - /* Windows API returns -1 from stat for "c:\dir\" if "c:\dir" exists - * OTOH, we should change "d:" to "d:\" and leave "\" as is. */ - wxString strPath(pszPathName); - if ( wxEndsWithPathSeparator(pszPathName) && pszPathName[1] != wxT('\0') ) - strPath.Last() = wxT('\0'); - -#ifdef __SALFORDC__ - struct _stat st; + wxStructStat st; +#ifndef __VISAGECPP__ + return wxStat(strPath.c_str(), &st) == 0 && ((st.st_mode & S_IFMT) == S_IFDIR); #else - struct stat st; + // S_IFMT not supported in VA compilers.. st_mode is a 2byte value only + return wxStat(pszPathName, &st) == 0 && (st.st_mode == S_IFDIR); #endif - return stat(wxFNSTRINGCAST strPath.fn_str(), &st) == 0 && (st.st_mode & S_IFDIR); +#endif // __WIN32__/!__WIN32__ } // Get a temporary filename, opening and closing the file. wxChar *wxGetTempFileName(const wxString& prefix, wxChar *buf) { -#ifdef __WINDOWS__ + wxString filename = wxFileName::CreateTempFileName(prefix); + if ( filename.empty() ) + return NULL; -#ifndef __WIN32__ - wxChar tmp[144]; - ::GetTempFileName(0, WXSTRINGCAST prefix, 0, tmp); -#else - wxChar tmp[MAX_PATH]; - wxChar tmpPath[MAX_PATH]; - ::GetTempPath(MAX_PATH, tmpPath); - ::GetTempFileName(tmpPath, WXSTRINGCAST prefix, 0, tmp); -#endif - if (buf) wxStrcpy(buf, tmp); - else buf = copystring(tmp); - return buf; + if ( buf ) + wxStrcpy(buf, filename); + else + buf = MYcopystring(filename); -#else - static short last_temp = 0; // cache last to speed things a bit - // At most 1000 temp files to a process! We use a ring count. - wxChar tmp[100]; // FIXME static buffer + return buf; +} - for (short suffix = last_temp + 1; suffix != last_temp; ++suffix %= 1000) - { - wxSprintf (tmp, wxT("/tmp/%s%d.%03x"), WXSTRINGCAST prefix, (int) getpid (), (int) suffix); - if (!wxFileExists( tmp )) - { - // Touch the file to create it (reserve name) - FILE *fd = fopen (wxFNCONV(tmp), "w"); - if (fd) - fclose (fd); - last_temp = suffix; - if (buf) - wxStrcpy( buf, tmp); - else - buf = copystring( tmp ); - return buf; - } - } - wxLogError( _("wxWindows: error finding temporary file name.\n") ); - if (buf) buf[0] = 0; - return (wxChar *) NULL; -#endif -} - -// Get first file name matching given wild card. +bool wxGetTempFileName(const wxString& prefix, wxString& buf) +{ + buf = wxFileName::CreateTempFileName(prefix); -#ifdef __UNIX__ + return !buf.empty(); +} // Get first file name matching given wild card. -// Flags are reserved for future use. -#if !defined( __VMS__ ) || ( __VMS_VER >= 70000000 ) - static DIR *gs_dirStream = (DIR *) NULL; - static wxString gs_strFileSpec; - static int gs_findFlags = 0; -#endif +static wxDir *gs_dir = NULL; +static wxString gs_dirPath; wxString wxFindFirstFile(const wxChar *spec, int flags) { - wxString result; - -#if !defined( __VMS__ ) || ( __VMS_VER >= 70000000 ) - if (gs_dirStream) - closedir(gs_dirStream); // edz 941103: better housekeping + wxSplitPath(spec, &gs_dirPath, NULL, NULL); + if ( gs_dirPath.empty() ) + gs_dirPath = wxT("."); + if ( !wxEndsWithPathSeparator(gs_dirPath ) ) + gs_dirPath << wxFILE_SEP_PATH; - gs_findFlags = flags; + if (gs_dir) + delete gs_dir; + gs_dir = new wxDir(gs_dirPath); - gs_strFileSpec = spec; - - // Find path only so we can concatenate - // found file onto path - wxString path(wxPathOnly(gs_strFileSpec)); - - // special case: path is really "/" - if ( !path && gs_strFileSpec[0u] == wxT('/') ) - path = wxT('/'); - // path is empty => Local directory - if ( !path ) - path = wxT('.'); - - gs_dirStream = opendir(path.fn_str()); - if ( !gs_dirStream ) + if ( !gs_dir->IsOpened() ) { - wxLogSysError(_("Can not enumerate files in directory '%s'"), - path.c_str()); + wxLogSysError(_("Can not enumerate files '%s'"), spec); + return wxEmptyString; } - else + + int dirFlags; + switch (flags) { - result = wxFindNextFile(); + case wxDIR: dirFlags = wxDIR_DIRS; break; + case wxFILE: dirFlags = wxDIR_FILES; break; + default: dirFlags = wxDIR_DIRS | wxDIR_FILES; break; } -#endif // !VMS6.x or earlier - - return result; -} -wxString wxFindNextFile() -{ wxString result; - -#if !defined( __VMS__ ) || ( __VMS_VER >= 70000000 ) - wxCHECK_MSG( gs_dirStream, result, wxT("must call wxFindFirstFile first") ); - - // Find path only so we can concatenate - // found file onto path - wxString path(wxPathOnly(gs_strFileSpec)); - wxString name(wxFileNameFromPath(gs_strFileSpec)); - - /* MATTHEW: special case: path is really "/" */ - if ( !path && gs_strFileSpec[0u] == wxT('/')) - path = wxT('/'); - - // Do the reading - struct dirent *nextDir; - for ( nextDir = readdir(gs_dirStream); - nextDir != NULL; - nextDir = readdir(gs_dirStream) ) + gs_dir->GetFirst(&result, wxFileNameFromPath(wxString(spec)), dirFlags); + if ( result.empty() ) { - if (wxMatchWild(name, nextDir->d_name)) - { - result.Empty(); - if ( !path.IsEmpty() ) - { - result = path; - if ( path != wxT('/') ) - result += wxT('/'); - } - - result += nextDir->d_name; - - // Only return "." and ".." when they match - bool isdir; - if ( (strcmp(nextDir->d_name, ".") == 0) || - (strcmp(nextDir->d_name, "..") == 0)) - { - if ( (gs_findFlags & wxDIR) != 0 ) - isdir = TRUE; - else - continue; - } - else - isdir = wxDirExists(result); - - // and only return directories when flags & wxDIR - if ( !gs_findFlags || - ((gs_findFlags & wxDIR) && isdir) || - ((gs_findFlags & wxFILE) && !isdir) ) - { - return result; - } - } + wxDELETE(gs_dir); + return result; } - result.Empty(); // not found - - closedir(gs_dirStream); - gs_dirStream = (DIR *) NULL; -#endif // !VMS6.2 or earlier - - return result; -} - -#elif defined(__WXMAC__) - -struct MacDirectoryIterator -{ - CInfoPBRec m_CPB ; - wxInt16 m_index ; - long m_dirId ; - Str255 m_name ; -} ; - -static int g_iter_flags ; - -static MacDirectoryIterator g_iter ; - -wxString wxFindFirstFile(const wxChar *spec, int flags) -{ - wxString result; - - g_iter_flags = flags; /* MATTHEW: [5] Remember flags */ - - // Find path only so we can concatenate found file onto path - wxString path(wxPathOnly(spec)); - if ( !path.IsEmpty() ) - result << path << wxT('\\'); - - FSSpec fsspec ; - - wxUnixFilename2FSSpec( result , &fsspec ) ; - g_iter.m_CPB.hFileInfo.ioVRefNum = fsspec.vRefNum ; - g_iter.m_CPB.hFileInfo.ioNamePtr = g_iter.m_name ; - g_iter.m_index = 0 ; - - Boolean isDir ; - FSpGetDirectoryID( &fsspec , &g_iter.m_dirId , &isDir ) ; - if ( !isDir ) - return wxEmptyString ; - - return wxFindNextFile( ) ; + return gs_dirPath + result; } wxString wxFindNextFile() { - wxString result; - - short err = noErr ; - - while ( err == noErr ) - { - g_iter.m_index++ ; - g_iter.m_CPB.dirInfo.ioFDirIndex = g_iter.m_index; - g_iter.m_CPB.dirInfo.ioDrDirID = g_iter.m_dirId; /* we need to do this every time */ - err = PBGetCatInfoSync((CInfoPBPtr)&g_iter.m_CPB); - if ( err != noErr ) - break ; - - if ( ( g_iter.m_CPB.dirInfo.ioFlAttrib & ioDirMask) != 0 && (g_iter_flags & wxDIR) ) // we have a directory - break ; - - if ( ( g_iter.m_CPB.dirInfo.ioFlAttrib & ioDirMask) == 0 && !(g_iter_flags & wxFILE ) ) - continue ; - - // hit ! - break ; - } - if ( err != noErr ) - { - return wxEmptyString ; - } - FSSpec spec ; - - FSMakeFSSpecCompat(g_iter.m_CPB.hFileInfo.ioVRefNum, - g_iter.m_dirId, - g_iter.m_name, - &spec) ; - - return wxMacFSSpec2UnixFilename( &spec ) ; -} + wxASSERT_MSG( gs_dir, wxT("You must call wxFindFirstFile before!") ); -#elif defined(__WXMSW__) - -#ifdef __WIN32__ - static HANDLE gs_hFileStruct = INVALID_HANDLE_VALUE; - static WIN32_FIND_DATA gs_findDataStruct; -#else // Win16 - #ifdef __BORLANDC__ - static struct ffblk gs_findDataStruct; - #else - static struct _find_t gs_findDataStruct; - #endif // Borland -#endif // Win32/16 - -static wxString gs_strFileSpec; -static int gs_findFlags = 0; - -wxString wxFindFirstFile(const wxChar *spec, int flags) -{ wxString result; + gs_dir->GetNext(&result); - gs_strFileSpec = spec; - gs_findFlags = flags; /* MATTHEW: [5] Remember flags */ - - // Find path only so we can concatenate found file onto path - wxString path(wxPathOnly(gs_strFileSpec)); - if ( !path.IsEmpty() ) - result << path << wxT('\\'); - -#ifdef __WIN32__ - if ( gs_hFileStruct != INVALID_HANDLE_VALUE ) - FindClose(gs_hFileStruct); - - gs_hFileStruct = ::FindFirstFile(WXSTRINGCAST spec, &gs_findDataStruct); - - if ( gs_hFileStruct == INVALID_HANDLE_VALUE ) + if ( result.empty() ) { - result.Empty(); - + wxDELETE(gs_dir); return result; } - bool isdir = !!(gs_findDataStruct.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY); - - if (isdir && !(flags & wxDIR)) - return wxFindNextFile(); - else if (!isdir && flags && !(flags & wxFILE)) - return wxFindNextFile(); - - result += gs_findDataStruct.cFileName; - - return result; -#else - int flag = _A_NORMAL; - if (flags & wxDIR) /* MATTHEW: [5] Use & */ - flag = _A_SUBDIR; - -#ifdef __BORLANDC__ - if (findfirst(WXSTRINGCAST spec, &gs_findDataStruct, flag) == 0) -#else - if (_dos_findfirst(WXSTRINGCAST spec, flag, &gs_findDataStruct) == 0) -#endif - { - /* MATTHEW: [5] Check directory flag */ - char attrib; - -#ifdef __BORLANDC__ - attrib = gs_findDataStruct.ff_attrib; -#else - attrib = gs_findDataStruct.attrib; -#endif - - if (attrib & _A_SUBDIR) { - if (!(gs_findFlags & wxDIR)) - return wxFindNextFile(); - } else if (gs_findFlags && !(gs_findFlags & wxFILE)) - return wxFindNextFile(); - - result += -#ifdef __BORLANDC__ - gs_findDataStruct.ff_name -#else - gs_findDataStruct.name -#endif - ; - } -#endif // __WIN32__ - - return result; + return gs_dirPath + result; } -wxString wxFindNextFile() -{ - wxString result; - // Find path only so we can concatenate found file onto path - wxString path(wxPathOnly(gs_strFileSpec)); +// Get current working directory. +// If buf is NULL, allocates space using new, else +// copies into buf. +wxChar *wxGetWorkingDirectory(wxChar *buf, int sz) +{ +#ifdef __WXWINCE__ + return NULL; +#else + if ( !buf ) + { + buf = new wxChar[sz + 1]; + } -try_again: + bool ok wxDUMMY_INITIALIZE(false); + + // for the compilers which have Unicode version of _getcwd(), call it + // directly, for the others call the ANSI version and do the translation +#if !wxUSE_UNICODE + #define cbuf buf +#else // wxUSE_UNICODE + bool needsANSI = true; + + #if !defined(HAVE_WGETCWD) || wxUSE_UNICODE_MSLU + // This is not legal code as the compiler + // is allowed destroy the wxCharBuffer. + // wxCharBuffer c_buffer(sz); + // char *cbuf = (char*)(const char*)c_buffer; + char cbuf[_MAXPATHLEN]; + #endif -#ifdef __WIN32__ - if (gs_hFileStruct == INVALID_HANDLE_VALUE) - return result; + #ifdef HAVE_WGETCWD + #if wxUSE_UNICODE_MSLU + if ( wxGetOsVersion() != wxWIN95 ) + #else + char *cbuf = NULL; // never really used because needsANSI will always be false + #endif + { + ok = _wgetcwd(buf, sz) != NULL; + needsANSI = false; + } + #endif - bool success = (FindNextFile(gs_hFileStruct, &gs_findDataStruct) != 0); - if (!success) + if ( needsANSI ) +#endif // wxUSE_UNICODE { - FindClose(gs_hFileStruct); - gs_hFileStruct = INVALID_HANDLE_VALUE; + #if defined(_MSC_VER) || defined(__MINGW32__) + ok = _getcwd(cbuf, sz) != NULL; + #elif defined(__WXMAC__) && !defined(__DARWIN__) + char lbuf[1024] ; + if ( getcwd( lbuf , sizeof( lbuf ) ) ) + { + wxString res( lbuf , *wxConvCurrent ) ; + wxStrcpy( buf , res ) ; + ok = true; + } + else + ok = false ; + #elif defined(__OS2__) + APIRET rc; + ULONG ulDriveNum = 0; + ULONG ulDriveMap = 0; + rc = ::DosQueryCurrentDisk(&ulDriveNum, &ulDriveMap); + ok = rc == 0; + if (ok) + { + sz -= 3; + rc = ::DosQueryCurrentDir( 0 // current drive + ,cbuf + 3 + ,(PULONG)&sz + ); + cbuf[0] = 'A' + (ulDriveNum - 1); + cbuf[1] = ':'; + cbuf[2] = '\\'; + ok = rc == 0; + } + #else // !Win32/VC++ !Mac !OS2 + ok = getcwd(cbuf, sz) != NULL; + #endif // platform + + #if wxUSE_UNICODE && !(defined(__WXMAC__) && !defined(__DARWIN__)) + // finally convert the result to Unicode if needed + wxConvFile.MB2WC(buf, cbuf, sz); + #endif // wxUSE_UNICODE } - else - { - bool isdir = !!(gs_findDataStruct.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY); - if (isdir && !(gs_findFlags & wxDIR)) - goto try_again; - else if (!isdir && gs_findFlags && !(gs_findFlags & wxFILE)) - goto try_again; + if ( !ok ) + { + wxLogSysError(_("Failed to get the working directory")); - if ( !path.IsEmpty() ) - result << path << wxT('\\'); - result << gs_findDataStruct.cFileName; + // VZ: the old code used to return "." on error which didn't make any + // 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'); } - - return result; -#else // Win16 - -#ifdef __BORLANDC__ - if (findnext(&gs_findDataStruct) == 0) -#else - if (_dos_findnext(&gs_findDataStruct) == 0) -#endif + else // ok, but we might need to massage the path into the right format + { +#ifdef __DJGPP__ + // VS: DJGPP is a strange mix of DOS and UNIX API and returns paths + // with / deliminers. We don't like that. + for (wxChar *ch = buf; *ch; ch++) { - /* MATTHEW: [5] Check directory flag */ - char attrib; - -#ifdef __BORLANDC__ - attrib = gs_findDataStruct.ff_attrib; -#else - attrib = gs_findDataStruct.attrib; -#endif - - if (attrib & _A_SUBDIR) { - if (!(gs_findFlags & wxDIR)) - goto try_again; - } else if (gs_findFlags && !(gs_findFlags & wxFILE)) - goto try_again; - - - result += -#ifdef __BORLANDC__ - gs_findDataStruct.ff_name -#else - gs_findDataStruct.name -#endif - ; + if (*ch == wxT('/')) + *ch = wxT('\\'); } -#endif // Win32/16 - - return result; -} +#endif // __DJGPP__ + +// MBN: we hope that in the case the user is compiling a GTK+/Motif app, +// he needs Unix as opposed to Win32 pathnames +#if defined( __CYGWIN__ ) && defined( __WINDOWS__ ) + // another example of DOS/Unix mix (Cygwin) + wxString pathUnix = buf; + cygwin_conv_to_full_win32_path(pathUnix, buf); +#endif // __CYGWIN__ + } -#endif // Unix/Windows + return buf; -// Get current working directory. -// If buf is NULL, allocates space using new, else -// copies into buf. -wxChar *wxGetWorkingDirectory(wxChar *buf, int sz) -{ - if (!buf) - buf = new wxChar[sz+1]; -#if wxUSE_UNICODE - char *cbuf = new char[sz+1]; -#ifdef _MSC_VER - if (_getcwd(cbuf, sz) == NULL) { -#elif defined( __WXMAC__) - enum - { - SFSaveDisk = 0x214, CurDirStore = 0x398 - }; - FSSpec cwdSpec ; - - FSMakeFSSpec( - *(short *) SFSaveDisk , *(long *) CurDirStore , NULL , &cwdSpec ) ; - wxString res = wxMacFSSpec2UnixFilename( &cwdSpec ) ; - strcpy( buf , res ) ; - if (0) { -#else - if (getcwd(cbuf, sz) == NULL) { -#endif - delete [] cbuf; -#else // wxUnicode -#ifdef _MSC_VER - if (_getcwd(buf, sz) == NULL) { -#elif defined( __WXMAC__) - enum - { - SFSaveDisk = 0x214, CurDirStore = 0x398 - }; - FSSpec cwdSpec ; - - FSMakeFSSpec( - *(short *) SFSaveDisk , *(long *) CurDirStore , NULL , &cwdSpec ) ; - wxString res = wxMacFSSpec2UnixFilename( &cwdSpec ) ; - strcpy( buf , res ) ; - if (0) { -#else - if (getcwd(buf, sz) == NULL) { +#if !wxUSE_UNICODE + #undef cbuf #endif + #endif - buf[0] = wxT('.'); - buf[1] = wxT('\0'); - } -#if wxUSE_UNICODE - else { - wxConvFile.MB2WC(buf, cbuf, sz); - delete [] cbuf; - } -#endif - return buf; + // __WXWINCE__ } wxString wxGetCwd() { - static const size_t maxPathLen = 1024; - - wxString str; - wxGetWorkingDirectory(str.GetWriteBuf(maxPathLen), maxPathLen); - str.UngetWriteBuf(); + wxChar *buffer = new wxChar[_MAXPATHLEN]; + wxGetWorkingDirectory(buffer, _MAXPATHLEN); + wxString str( buffer ); + delete [] buffer; return str; } bool wxSetWorkingDirectory(const wxString& d) { -#if defined( __UNIX__ ) || defined( __WXMAC__ ) || defined(__WXPM__) - return (chdir(wxFNSTRINGCAST d.fn_str()) == 0); +#if defined(__OS2__) + return (::DosSetCurrentDir((PSZ)d.c_str()) == 0); +#elif defined(__UNIX__) || defined(__WXMAC__) || defined(__DOS__) + return (chdir(wxFNSTRINGCAST d.fn_str()) == 0); #elif defined(__WINDOWS__) #ifdef __WIN32__ - return (bool)(SetCurrentDirectory(d) != 0); +#ifdef __WXWINCE__ + // No equivalent in WinCE + return false; #else - // Must change drive, too. - bool isDriveSpec = ((strlen(d) > 1) && (d[1] == ':')); - if (isDriveSpec) - { - wxChar firstChar = d[0]; + return (bool)(SetCurrentDirectory(d) != 0); +#endif +#else + // Must change drive, too. + bool isDriveSpec = ((strlen(d) > 1) && (d[1] == ':')); + if (isDriveSpec) + { + wxChar firstChar = d[0]; - // To upper case - if (firstChar > 90) - firstChar = firstChar - 32; + // To upper case + if (firstChar > 90) + firstChar = firstChar - 32; - // To a drive number - unsigned int driveNo = firstChar - 64; - if (driveNo > 0) - { - unsigned int noDrives; - _dos_setdrive(driveNo, &noDrives); + // To a drive number + unsigned int driveNo = firstChar - 64; + if (driveNo > 0) + { + unsigned int noDrives; + _dos_setdrive(driveNo, &noDrives); + } } - } - bool success = (chdir(WXSTRINGCAST d) == 0); + bool success = (chdir(WXSTRINGCAST d) == 0); - return success; + return success; #endif #endif @@ -1684,10 +1477,14 @@ bool wxSetWorkingDirectory(const wxString& d) // On non-Windows platform, probably just return the empty string. wxString wxGetOSDirectory() { -#ifdef __WINDOWS__ +#ifdef __WXWINCE__ + return wxString(wxT("\\Windows")); +#elif defined(__WINDOWS__) && !defined(__WXMICROWIN__) wxChar buf[256]; GetWindowsDirectory(buf, 256); return wxString(buf); +#elif defined(__WXMAC__) + return wxMacFindFolder(kOnSystemDisk, 'macs', false); #else return wxEmptyString; #endif @@ -1695,19 +1492,17 @@ wxString wxGetOSDirectory() bool wxEndsWithPathSeparator(const wxChar *pszFileName) { - size_t len = wxStrlen(pszFileName); - if ( len == 0 ) - return FALSE; - else - return wxIsPathSeparator(pszFileName[len - 1]); + size_t len = wxStrlen(pszFileName); + + return len && wxIsPathSeparator(pszFileName[len - 1]); } // find a file in a list of directories, returns false if not found bool wxFindFileInPath(wxString *pStr, const wxChar *pszPath, const wxChar *pszFile) { // we assume that it's not empty - wxCHECK_MSG( !wxIsEmpty(pszFile), FALSE, - _("empty file name in wxFindFileInPath")); + wxCHECK_MSG( !wxIsEmpty(pszFile), false, + _T("empty file name in wxFindFileInPath")); // skip path separator in the beginning of the file name if present if ( wxIsPathSeparator(*pszFile) ) @@ -1729,7 +1524,7 @@ bool wxFindFileInPath(wxString *pStr, const wxChar *pszPath, const wxChar *pszFi strFile += wxFILE_SEP_PATH; strFile += pszFile; - if ( FileExists(strFile) ) { + if ( wxFileExists(strFile) ) { *pStr = strFile; break; } @@ -1752,226 +1547,311 @@ void WXDLLEXPORT wxSplitPath(const wxChar *pszFileName, // it can be empty, but it shouldn't be NULL wxCHECK_RET( pszFileName, wxT("NULL file name in wxSplitPath") ); - const wxChar *pDot = wxStrrchr(pszFileName, wxFILE_SEP_EXT); + wxFileName::SplitPath(pszFileName, pstrPath, pstrName, pstrExt); +} -#ifdef __WXMSW__ - // under Windows we understand both separators - const wxChar *pSepUnix = wxStrrchr(pszFileName, wxFILE_SEP_PATH_UNIX); - const wxChar *pSepDos = wxStrrchr(pszFileName, wxFILE_SEP_PATH_DOS); - const wxChar *pLastSeparator = pSepUnix > pSepDos ? pSepUnix : pSepDos; -#else // assume Unix - const wxChar *pLastSeparator = wxStrrchr(pszFileName, wxFILE_SEP_PATH_UNIX); - - if ( pDot == pszFileName ) +time_t WXDLLEXPORT wxFileModificationTime(const wxString& filename) +{ +#ifdef __WXWINCE__ + FILETIME creationTime, lastAccessTime, lastWriteTime; + HANDLE fileHandle = ::CreateFile(filename, GENERIC_READ, FILE_SHARE_READ, NULL, + 0, FILE_ATTRIBUTE_NORMAL, 0); + if (fileHandle == INVALID_HANDLE_VALUE) + return 0; + else { - // under Unix files like .profile are treated in a special way - pDot = NULL; - } -#endif // MSW/Unix + if (GetFileTime(fileHandle, & creationTime, & lastAccessTime, & lastWriteTime)) + { + CloseHandle(fileHandle); - if ( pDot < pLastSeparator ) - { - // the dot is part of the path, not the start of the extension - pDot = NULL; + wxDateTime dateTime; + FILETIME ftLocal; + if ( !::FileTimeToLocalFileTime(&lastWriteTime, &ftLocal) ) + { + wxLogLastError(_T("FileTimeToLocalFileTime")); + } + + SYSTEMTIME st; + if ( !::FileTimeToSystemTime(&ftLocal, &st) ) + { + wxLogLastError(_T("FileTimeToSystemTime")); + } + + dateTime.Set(st.wDay, wxDateTime::Month(st.wMonth - 1), st.wYear, + st.wHour, st.wMinute, st.wSecond, st.wMilliseconds); + return dateTime.GetTicks(); + } + else + return 0; } +#else + wxStructStat buf; + wxStat( filename, &buf); + + return buf.st_mtime; +#endif +} + - if ( pstrPath ) +// Parses the filterStr, returning the number of filters. +// Returns 0 if none or if there's a problem. +// filterStr is in the form: "All files (*.*)|*.*|JPEG Files (*.jpeg)|*.jpeg" + +int WXDLLEXPORT wxParseCommonDialogsFilter(const wxString& filterStr, wxArrayString& descriptions, wxArrayString& filters) +{ + descriptions.Clear(); + filters.Clear(); + + wxString str(filterStr); + + wxString description, filter; + int pos = 0; + while( pos != wxNOT_FOUND ) { - if ( pLastSeparator ) - *pstrPath = wxString(pszFileName, pLastSeparator - pszFileName); + pos = str.Find(wxT('|')); + if ( pos == wxNOT_FOUND ) + { + // if there are no '|'s at all in the string just take the entire + // string as filter and make description empty for later autocompletion + if ( filters.IsEmpty() ) + { + descriptions.Add(wxEmptyString); + filters.Add(filterStr); + } + else + { + wxFAIL_MSG( _T("missing '|' in the wildcard string!") ); + } + + break; + } + + description = str.Left(pos); + str = str.Mid(pos + 1); + pos = str.Find(wxT('|')); + if ( pos == wxNOT_FOUND ) + { + filter = str; + } else - pstrPath->Empty(); + { + filter = str.Left(pos); + str = str.Mid(pos + 1); + } + + descriptions.Add(description); + filters.Add(filter); } - if ( pstrName ) +#if defined(__WXMOTIF__) + // split it so there is one wildcard per entry + for( size_t i = 0 ; i < descriptions.GetCount() ; i++ ) { - const wxChar *start = pLastSeparator ? pLastSeparator + 1 : pszFileName; - const wxChar *end = pDot ? pDot : pszFileName + wxStrlen(pszFileName); - - *pstrName = wxString(start, end - start); + pos = filters[i].Find(wxT(';')); + if (pos != wxNOT_FOUND) + { + // first split only filters + descriptions.Insert(descriptions[i],i+1); + filters.Insert(filters[i].Mid(pos+1),i+1); + filters[i]=filters[i].Left(pos); + + // autoreplace new filter in description with pattern: + // C/C++ Files(*.cpp;*.c;*.h)|*.cpp;*.c;*.h + // cause split into: + // C/C++ Files(*.cpp)|*.cpp + // C/C++ Files(*.c;*.h)|*.c;*.h + // and next iteration cause another split into: + // C/C++ Files(*.cpp)|*.cpp + // C/C++ Files(*.c)|*.c + // C/C++ Files(*.h)|*.h + for ( size_t k=i;kbefore.Find(_T(')'),true)) + { + before = before.Left(pos+1); + before << filters[k]; + pos = after.Find(_T(')')); + int pos1 = after.Find(_T('(')); + if (pos != wxNOT_FOUND && (posEmpty(); + if ( descriptions[j] == wxEmptyString && filters[j] != wxEmptyString ) + { + descriptions[j].Printf(_("Files (%s)"), filters[j].c_str()); + } } + + return filters.GetCount(); } + //------------------------------------------------------------------------ // wild character routines //------------------------------------------------------------------------ bool wxIsWild( const wxString& pattern ) { - wxString tmp = pattern; - wxChar *pat = WXSTRINGCAST(tmp); - while (*pat) { - switch (*pat++) { + wxString tmp = pattern; + wxChar *pat = WXSTRINGCAST(tmp); + while (*pat) + { + switch (*pat++) + { case wxT('?'): case wxT('*'): case wxT('['): case wxT('{'): - return TRUE; + return true; case wxT('\\'): if (!*pat++) - return FALSE; + return false; } } - return FALSE; -}; + return false; +} -bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special ) +/* +* Written By Douglas A. Lewis +* +* The match procedure is public domain code (from ircII's reg.c) +*/ -#if defined(HAVE_FNMATCH_H) +bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special ) { -// this probably won't work well for multibyte chars in Unicode mode? - if(dot_special) - return fnmatch(pat.fn_str(), text.fn_str(), FNM_PERIOD) == 0; - else - return fnmatch(pat.fn_str(), text.fn_str(), 0) == 0; -} -#else + if (text.empty()) + { + /* Match if both are empty. */ + return pat.empty(); + } -// #pragma error Broken implementation of wxMatchWild() -- needs fixing! + const wxChar *m = pat.c_str(), + *n = text.c_str(), + *ma = NULL, + *na = NULL, + *mp = NULL, + *np = NULL; + int just = 0, + pcount = 0, + acount = 0, + count = 0; + + if (dot_special && (*n == wxT('.'))) + { + /* Never match so that hidden Unix files + * are never found. */ + return false; + } - /* - * WARNING: this code is broken! - */ -{ - wxString tmp1 = pat; - wxChar *pattern = WXSTRINGCAST(tmp1); - wxString tmp2 = text; - wxChar *str = WXSTRINGCAST(tmp2); - wxChar c; - wxChar *cp; - bool done = FALSE, ret_code, ok; - // Below is for vi fans - const wxChar OB = wxT('{'), CB = wxT('}'); - - // dot_special means '.' only matches '.' - if (dot_special && *str == wxT('.') && *pattern != *str) - return FALSE; - - while ((*pattern != wxT('\0')) && (!done) - && (((*str==wxT('\0'))&&((*pattern==OB)||(*pattern==wxT('*'))))||(*str!=wxT('\0')))) { - switch (*pattern) { - case wxT('\\'): - pattern++; - if (*pattern != wxT('\0')) - pattern++; - break; - case wxT('*'): - pattern++; - ret_code = FALSE; - while ((*str!=wxT('\0')) - && (!(ret_code=wxMatchWild(pattern, str++, FALSE)))) - /*loop*/; - if (ret_code) { - while (*str != wxT('\0')) - str++; - while (*pattern != wxT('\0')) - pattern++; - } - break; - case wxT('['): - pattern++; - repeat: - if ((*pattern == wxT('\0')) || (*pattern == wxT(']'))) { - done = TRUE; - break; - } - if (*pattern == wxT('\\')) { - pattern++; - if (*pattern == wxT('\0')) { - done = TRUE; - break; - } - } - if (*(pattern + 1) == wxT('-')) { - c = *pattern; - pattern += 2; - if (*pattern == wxT(']')) { - done = TRUE; - break; - } - if (*pattern == wxT('\\')) { - pattern++; - if (*pattern == wxT('\0')) { - done = TRUE; - break; - } - } - if ((*str < c) || (*str > *pattern)) { - pattern++; - goto repeat; + for (;;) + { + if (*m == wxT('*')) + { + ma = ++m; + na = n; + just = 1; + mp = NULL; + acount = count; } - } else if (*pattern != *str) { - pattern++; - goto repeat; - } - pattern++; - while ((*pattern != wxT(']')) && (*pattern != wxT('\0'))) { - if ((*pattern == wxT('\\')) && (*(pattern + 1) != wxT('\0'))) - pattern++; - pattern++; - } - if (*pattern != wxT('\0')) { - pattern++, str++; - } - break; - case wxT('?'): - pattern++; - str++; - break; - case OB: - pattern++; - while ((*pattern != CB) && (*pattern != wxT('\0'))) { - cp = str; - ok = TRUE; - while (ok && (*cp != wxT('\0')) && (*pattern != wxT('\0')) - && (*pattern != wxT(',')) && (*pattern != CB)) { - if (*pattern == wxT('\\')) - pattern++; - ok = (*pattern++ == *cp++); + else if (*m == wxT('?')) + { + m++; + if (!*n++) + return false; } - if (*pattern == wxT('\0')) { - ok = FALSE; - done = TRUE; - break; - } else if (ok) { - str = cp; - while ((*pattern != CB) && (*pattern != wxT('\0'))) { - if (*++pattern == wxT('\\')) { - if (*++pattern == CB) - pattern++; + else + { + if (*m == wxT('\\')) + { + m++; + /* Quoting "nothing" is a bad thing */ + if (!*m) + return false; } - } - } else { - while (*pattern!=CB && *pattern!=wxT(',') && *pattern!=wxT('\0')) { - if (*++pattern == wxT('\\')) { - if (*++pattern == CB || *pattern == wxT(',')) - pattern++; + if (!*m) + { + /* + * If we are out of both strings or we just + * saw a wildcard, then we can say we have a + * match + */ + if (!*n) + return true; + if (just) + return true; + just = 0; + goto not_matched; + } + /* + * We could check for *n == NULL at this point, but + * since it's more common to have a character there, + * check to see if they match first (m and n) and + * then if they don't match, THEN we can check for + * the NULL of n + */ + just = 0; + if (*m == *n) + { + m++; + if (*n == wxT(' ')) + mp = NULL; + count++; + n++; + } + else + { + + not_matched: + + /* + * If there are no more characters in the + * string, but we still need to find another + * character (*m != NULL), then it will be + * impossible to match it + */ + if (!*n) + return false; + if (mp) + { + m = mp; + if (*np == wxT(' ')) + { + mp = NULL; + goto check_percent; + } + n = ++np; + count = pcount; + } + else + check_percent: + + if (ma) + { + m = ma; + n = ++na; + count = acount; + } + else + return false; } - } } - if (*pattern != wxT('\0')) - pattern++; - } - break; - default: - if (*str == *pattern) { - str++, pattern++; - } else { - done = TRUE; - } } - } - while (*pattern == wxT('*')) - pattern++; - return ((*str == wxT('\0')) && (*pattern == wxT('\0'))); -}; +} -#endif #ifdef __VISUALC__ #pragma warning(default:4706) // assignment within conditional expression