/////////////////////////////////////////////////////////////////////////////
-// Name: filefn.cpp
+// Name: src/common/filefn.cpp
// Purpose: File- and directory-related functions
// Author: Julian Smart
// Modified by:
// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "filefn.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
-#include "wx/defs.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
-#include "wx/utils.h"
-#include "wx/intl.h"
+#ifndef WX_PRECOMP
+ #include "wx/intl.h"
+ #include "wx/log.h"
+ #include "wx/utils.h"
+#endif
+
#include "wx/file.h" // This does include filefn.h
#include "wx/filename.h"
#include "wx/dir.h"
+#include "wx/tokenzr.h"
+
// there are just too many of those...
#ifdef __VISUALC__
#pragma warning(disable:4706) // assignment within conditional expression
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#if !defined(__WATCOMC__)
+#if !wxONLY_WATCOM_EARLIER_THAN(1,4)
#if !(defined(_MSC_VER) && (_MSC_VER > 800))
#include <errno.h>
#endif
#include "wx/mac/private.h" // includes mac headers
#endif
-#include "wx/log.h"
-
-// No, Cygwin doesn't appear to have fnmatch.h after all.
-#if defined(HAVE_FNMATCH_H)
- #include "fnmatch.h"
-#endif
-
#ifdef __WINDOWS__
#include "wx/msw/private.h"
#include "wx/msw/mslu.h"
// wxPathList
// ----------------------------------------------------------------------------
-// IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxStringList)
-
-static inline wxChar* MYcopystring(const wxString& s)
+void wxPathList::Add (const wxString& path)
{
- wxChar* copy = new wxChar[s.length() + 1];
- return wxStrcpy(copy, s.c_str());
-}
+ // add only the path part of the given string (not the filename, in case it's present)
+ wxFileName fn(path + wxFileName::GetPathSeparator());
+ fn.Normalize(); // add only normalized paths
-static inline wxChar* MYcopystring(const wxChar* s)
-{
- wxChar* copy = new wxChar[wxStrlen(s) + 1];
- return wxStrcpy(copy, s);
+ wxString toadd = fn.GetPath();
+ if (Index(toadd) == wxNOT_FOUND)
+ wxArrayString::Add(toadd); // do not add duplicates
}
-void wxPathList::Add (const wxString& path)
+void wxPathList::Add(const wxArrayString &arr)
{
- wxStringList::Add (WXSTRINGCAST path);
+ for (size_t j=0; j < arr.GetCount(); j++)
+ Add(arr[j]);
}
// Add paths e.g. from the PATH environment variable
-void wxPathList::AddEnvList (const wxString& envVariable)
+void wxPathList::AddEnvList (const wxString& WXUNUSED_IN_WINCE(envVariable))
{
// No environment variables on WinCE
#ifndef __WXWINCE__
+
+ // 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"; this is true for both Windows and Unix.
+
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)
+ wxT(";"); // Don't separate with colon in DOS (used for drive)
#else
- wxT(" :;");
+ wxT(":;");
#endif
- wxChar *val = wxGetenv (WXSTRINGCAST envVariable);
- if (val && *val)
+ wxString val;
+ if ( wxGetEnv(envVariable, &val) )
{
- wxChar *s = MYcopystring (val);
- wxChar *save_ptr, *token = wxStrtok (s, PATH_TOKS, &save_ptr);
-
- 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;
-
- delete [] s;
+ // split into an array of string the value of the env var
+ wxArrayString arr = wxStringTokenize(val, PATH_TOKS);
+ WX_APPEND_ARRAY(*this, arr);
}
-#else // __WXWINCE__
- wxUnusedVar(envVariable);
-#endif // !__WXWINCE__/__WXWINCE__
+#endif // !__WXWINCE__
}
// Given a full filename (with path), ensure that that file can
wxString path_only(wxPathOnly(path));
if ( !path_only.empty() )
{
- if ( !Member(path_only) )
+ if ( Index(path_only) == wxNOT_FOUND )
Add(path_only);
}
}
-bool wxPathList::Member (const wxString& path)
+// deprecated !
+bool wxPathList::Member (const wxString& path) const
{
- for (wxStringList::compatibility_iterator node = GetFirst(); node; node = node->GetNext())
- {
- wxString path2( node->GetData() );
- if (
-#if defined(__WINDOWS__) || defined(__OS2__) || defined(__VMS__) || defined(__WXMAC__)
- // Case INDEPENDENT
- path.CompareTo (path2, wxString::ignoreCase) == 0
-#else
- // Case sensitive File System
- path.CompareTo (path2) == 0
-#endif
- )
- return true;
- }
- return false;
+ return Index(path) != wxNOT_FOUND;
}
-wxString wxPathList::FindValidPath (const wxString& file)
+wxString wxPathList::FindValidPath (const wxString& file) const
{
- if (wxFileExists (wxExpandPath(wxFileFunctionsBuffer, file)))
- return wxString(wxFileFunctionsBuffer);
-
- wxChar buf[_MAXPATHLEN];
- wxStrcpy(buf, wxFileFunctionsBuffer);
+ wxFileName fn(file);
+ wxString strend;
- wxChar *filename = wxIsAbsolutePath (buf) ? wxFileNameFromPath (buf) : (wxChar *)buf;
+ fn.Normalize();
+ if (fn.IsAbsolute())
+ strend = fn.GetFullName();
+ else
+ strend = fn.GetFullPath();
- for (wxStringList::compatibility_iterator node = GetFirst(); node; node = node->GetNext())
+ for (size_t i=0; i<GetCount(); i++)
{
- 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__
- wxUnix2DosFilename (wxFileFunctionsBuffer);
-#endif
- if (wxFileExists (wxFileFunctionsBuffer))
- {
- return wxString(wxFileFunctionsBuffer); // Found!
- }
- } // for()
+ wxString strstart = Item(i);
+ if (!strstart.IsEmpty() && strstart.Last() != wxFileName::GetPathSeparator())
+ strstart += wxFileName::GetPathSeparator();
+
+ if (wxFileExists(strstart + strend))
+ return strstart + strend; // Found!
+ }
- return wxEmptyString; // Not found
+ return wxEmptyString; // Not found
}
-wxString wxPathList::FindAbsoluteValidPath (const wxString& file)
+wxString wxPathList::FindAbsoluteValidPath (const wxString& file) const
{
wxString f = FindValidPath(file);
if ( f.empty() || wxIsAbsolutePath(f) )
return f;
- wxString buf;
- wxGetWorkingDirectory(wxStringBuffer(buf, _MAXPATHLEN), _MAXPATHLEN);
+ wxString buf = ::wxGetCwd();
if ( !wxEndsWithPathSeparator(buf) )
{
return buf;
}
+// ----------------------------------------------------------------------------
+// miscellaneous global functions (TOFIX!)
+// ----------------------------------------------------------------------------
+
+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);
+}
+
+
bool
wxFileExists (const wxString& filename)
{
return (ret != (DWORD)-1) && !(ret & FILE_ATTRIBUTE_DIRECTORY);
#else // !__WIN32__
+ #ifndef S_ISREG
+ #define S_ISREG(mode) ((mode) & S_IFREG)
+ #endif
wxStructStat st;
#ifndef wxNEED_WX_UNISTD_H
- return wxStat( filename.fn_str() , &st) == 0 && (st.st_mode & S_IFREG);
+ return (wxStat( filename.fn_str() , &st) == 0 && S_ISREG(st.st_mode))
+#ifdef __OS2__
+ || (errno == EACCES) // if access is denied something with that name
+ // exists and is opened in exclusive mode.
+#endif
+ ;
#else
- return wxStat( filename , &st) == 0 && (st.st_mode & S_IFREG);
+ return wxStat( filename , &st) == 0 && S_ISREG(st.st_mode);
#endif
#endif // __WIN32__/!__WIN32__
}
void wxStripExtension(wxChar *buffer)
{
- int len = wxStrlen(buffer);
- int i = len-1;
- while (i > 0)
- {
- if (buffer[i] == wxT('.'))
+ int len = wxStrlen(buffer);
+ int i = len-1;
+ while (i > 0)
{
- buffer[i] = 0;
- break;
+ if (buffer[i] == wxT('.'))
+ {
+ buffer[i] = 0;
+ break;
+ }
+ i --;
}
- i --;
- }
}
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)
+ //buffer.length() == 0
+ for(size_t i = buffer.length() - 1; i != wxString::npos; --i)
{
if (buffer.GetChar(i) == wxT('.'))
{
return path;
}
+wxString wxRealPath(const wxString& path)
+{
+ wxChar *buf1=MYcopystring(path);
+ wxChar *buf2=wxRealPath(buf1);
+ wxString buf(buf2);
+ delete [] buf1;
+ return buf;
+}
+
+
// Must be destroyed
wxChar *wxCopyAbsolutePath(const wxString& filename)
{
- if (filename.empty())
- return (wxChar *) NULL;
+ if (filename.empty())
+ return (wxChar *) NULL;
- if (! wxIsAbsolutePath(wxExpandPath(wxFileFunctionsBuffer, filename))) {
- wxChar buf[_MAXPATHLEN];
- buf[0] = wxT('\0');
- wxGetWorkingDirectory(buf, WXSIZEOF(buf));
- wxChar ch = buf[wxStrlen(buf) - 1];
+ if (! wxIsAbsolutePath(wxExpandPath(wxFileFunctionsBuffer, filename)))
+ {
+ wxString buf = ::wxGetCwd();
+ wxChar ch = buf.Last();
#ifdef __WXMSW__
- if (ch != wxT('\\') && ch != wxT('/'))
- wxStrcat(buf, wxT("\\"));
+ if (ch != wxT('\\') && ch != wxT('/'))
+ buf << wxT("\\");
#else
- if (ch != wxT('/'))
- wxStrcat(buf, wxT("/"));
+ if (ch != wxT('/'))
+ buf << wxT("/");
#endif
- wxStrcat(buf, wxFileFunctionsBuffer);
- return MYcopystring( wxRealPath(buf) );
- }
- return MYcopystring( wxFileFunctionsBuffer );
+ buf << wxFileFunctionsBuffer;
+ buf = wxRealPath( buf );
+ return MYcopystring( buf );
+ }
+ return MYcopystring( wxFileFunctionsBuffer );
}
/*-
while ((*d++ = *s) != 0) {
# ifndef __WXMSW__
if (*s == wxT('\\')) {
- if ((*(d - 1) = *++s)) {
+ if ((*(d - 1) = *++s)!=0) {
s++;
continue;
} else
nnm = *s ? s + 1 : s;
*s = 0;
// 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;
+ if ((home = WXSTRINGCAST wxGetUserHome(wxString(nm + 1))) == NULL)
+ {
+ if (was_sep) /* replace only if it was there: */
+ *s = SEP;
s = NULL;
- } else {
+ }
+ else
+ {
nm = nnm;
s = home;
}
The call wxExpandPath can convert these back!
*/
wxChar *
-wxContractPath (const wxString& filename, const wxString& envname, const wxString& user)
+wxContractPath (const wxString& filename,
+ const wxString& WXUNUSED_IN_WINCE(envname),
+ const wxString& user)
{
static wxChar dest[_MAXPATHLEN];
wxStrcat (tcp, wxT("}"));
wxStrcat (tcp, wxFileFunctionsBuffer);
}
-#else
- wxUnusedVar(envname);
#endif
// Handle User's home (ignore root homes!)
// Local copy
wxStrcpy (buf, WXSTRINGCAST path);
- int l = path.Length();
+ int l = path.length();
int i = l - 1;
// Search backward for a backward or forward slash
}
CFStringRef cfString = CFURLCopyFileSystemPath(fullURLRef, kDefaultPathStyle);
CFRelease( fullURLRef ) ;
- return wxMacCFStringHolder(cfString).AsString(wxLocale::GetSystemEncoding());
+ CFMutableStringRef cfMutableString = CFStringCreateMutableCopy(NULL, 0, cfString);
+ CFRelease( cfString );
+ CFStringNormalize(cfMutableString,kCFStringNormalizationFormC);
+ return wxMacCFStringHolder(cfMutableString).AsString();
}
OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef )
{
OSStatus err = noErr ;
- CFURLRef url = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, wxMacCFStringHolder(path ,wxLocale::GetSystemEncoding() ) , kDefaultPathStyle, false);
+ CFMutableStringRef cfMutableString = CFStringCreateMutableCopy(NULL, 0, wxMacCFStringHolder(path));
+ CFStringNormalize(cfMutableString,kCFStringNormalizationFormD);
+ CFURLRef url = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, cfMutableString , kDefaultPathStyle, false);
+ CFRelease( cfMutableString );
if ( NULL != url )
{
if ( CFURLGetFSRef(url, fsRef) == false )
CFStringRef cfname = CFStringCreateWithCharacters( kCFAllocatorDefault,
uniname->unicode,
uniname->length );
- return wxMacCFStringHolder(cfname).AsString() ;
+ CFMutableStringRef cfMutableString = CFStringCreateMutableCopy(NULL, 0, cfname);
+ CFRelease( cfname );
+ CFStringNormalize(cfMutableString,kCFStringNormalizationFormC);
+ return wxMacCFStringHolder(cfMutableString).AsString() ;
}
wxString wxMacFSSpec2MacFilename( const FSSpec *spec )
bool
wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& file3)
{
- wxString outfile;
- if ( !wxGetTempFileName( wxT("cat"), outfile) )
- return false;
-
- FILE *fp1 wxDUMMY_INITIALIZE(NULL);
- FILE *fp2 = NULL;
- FILE *fp3 = NULL;
- // Open the inputs and outputs
- if ((fp1 = wxFopen ( file1, wxT("rb"))) == NULL ||
- (fp2 = wxFopen ( file2, wxT("rb"))) == NULL ||
- (fp3 = wxFopen ( outfile, wxT("wb"))) == NULL)
+#if wxUSE_FILE
+
+ wxFile in1(file1), in2(file2);
+ wxTempFile out(file3);
+
+ if ( !in1.IsOpened() || !in2.IsOpened() || !out.IsOpened() )
+ return false;
+
+ ssize_t ofs;
+ unsigned char buf[1024];
+
+ for( int i=0; i<2; i++)
{
- if (fp1)
- fclose (fp1);
- if (fp2)
- fclose (fp2);
- if (fp3)
- fclose (fp3);
- return false;
+ wxFile *in = i==0 ? &in1 : &in2;
+ do{
+ if ( (ofs = in->Read(buf,WXSIZEOF(buf))) == wxInvalidOffset ) return false;
+ if ( ofs > 0 )
+ if ( !out.Write(buf,ofs) )
+ return false;
+ } while ( ofs == (ssize_t)WXSIZEOF(buf) );
}
- int ch;
- while ((ch = getc (fp1)) != EOF)
- (void) putc (ch, fp3);
- fclose (fp1);
+ return out.Commit();
- while ((ch = getc (fp2)) != EOF)
- (void) putc (ch, fp3);
- fclose (fp2);
+#else
- fclose (fp3);
- bool result = wxRenameFile(outfile, file3);
- return result;
+ wxUnusedVar(file1);
+ wxUnusedVar(file2);
+ wxUnusedVar(file3);
+ return false;
+
+#endif
}
// Copy files
}
bool
-wxRenameFile (const wxString& file1, const wxString& file2)
+wxRenameFile(const wxString& file1, const wxString& file2, bool overwrite)
{
+ if ( !overwrite && wxFileExists(file2) )
+ {
+ wxLogSysError
+ (
+ _("Failed to rename the file '%s' to '%s' because the destination file already exists."),
+ file1.c_str(), file2.c_str()
+ );
+
+ return false;
+ }
+
#if !defined(__WXWINCE__) && !defined(__WXPALMOS__)
// Normal system call
if ( wxRename (file1, file2) == 0 )
#endif
// Try to copy
- if (wxCopyFile(file1, file2)) {
+ if (wxCopyFile(file1, file2, overwrite)) {
wxRemoveFile(file1);
return true;
}
if ( mkdir(wxFNCONV(dirname), perm) != 0 )
#endif
#elif defined(__OS2__)
+ wxUnusedVar(perm);
if (::DosCreateDir((PSZ)dirname, NULL) != 0) // enhance for EAB's??
#elif defined(__DOS__)
#if defined(__WATCOMC__)
return (ret != (DWORD)-1) && (ret & FILE_ATTRIBUTE_DIRECTORY);
#elif defined(__OS2__)
- return (::DosSetCurrentDir((PSZ)(WXSTRINGCAST strPath)));
+ FILESTATUS3 Info = {{0}};
+ APIRET rc = ::DosQueryPathInfo((PSZ)(WXSTRINGCAST strPath), FIL_STANDARD,
+ (void*) &Info, sizeof(FILESTATUS3));
+
+ return ((rc == NO_ERROR) && (Info.attrFile & FILE_DIRECTORY)) ||
+ (rc == ERROR_SHARING_VIOLATION);
+ // If we got a sharing violation, there must be something with this name.
#else // !__WIN32__
wxStructStat st;
// Get current working directory.
-// If buf is NULL, allocates space using new, else
-// copies into buf.
-wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
+// If buf is NULL, allocates space using new, else copies into buf.
+// wxGetWorkingDirectory() is obsolete, use wxGetCwd()
+// wxDoGetCwd() is their common core to be moved
+// to wxGetCwd() once wxGetWorkingDirectory() will be removed.
+// Do not expose wxDoGetCwd in headers!
+
+wxChar *wxDoGetCwd(wxChar *buf, int sz)
{
#if defined(__WXPALMOS__)
- // TODO ?
- return NULL;
+ // TODO
+ if(buf && sz>0) buf[0] = _T('\0');
+ return buf;
#elif defined(__WXWINCE__)
// TODO
- wxUnusedVar(buf);
- wxUnusedVar(sz);
- return NULL;
+ if(buf && sz>0) buf[0] = _T('\0');
+ return buf;
#else
if ( !buf )
{
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
,cbuf + 3
,(PULONG)&sz
);
- cbuf[0] = 'A' + (ulDriveNum - 1);
+ cbuf[0] = char('A' + (ulDriveNum - 1));
cbuf[1] = ':';
cbuf[2] = '\\';
ok = rc == 0;
#if defined( __CYGWIN__ ) && defined( __WINDOWS__ )
// another example of DOS/Unix mix (Cygwin)
wxString pathUnix = buf;
+#if wxUSE_UNICODE
+ char bufA[_MAXPATHLEN];
+ cygwin_conv_to_full_win32_path(pathUnix.mb_str(wxConvFile), bufA);
+ wxConvFile.MB2WC(buf, bufA, sz);
+#else
cygwin_conv_to_full_win32_path(pathUnix, buf);
+#endif // wxUSE_UNICODE
#endif // __CYGWIN__
}
// __WXWINCE__
}
-wxString wxGetCwd()
+#if WXWIN_COMPATIBILITY_2_6
+wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
{
- wxChar *buffer = new wxChar[_MAXPATHLEN];
- wxGetWorkingDirectory(buffer, _MAXPATHLEN);
- wxString str( buffer );
- delete [] buffer;
+ return wxDoGetCwd(buf,sz);
+}
+#endif // WXWIN_COMPATIBILITY_2_6
+wxString wxGetCwd()
+{
+ wxString str;
+ wxDoGetCwd(wxStringBuffer(str, _MAXPATHLEN), _MAXPATHLEN);
return str;
}
time_t WXDLLEXPORT wxFileModificationTime(const wxString& filename)
{
-#if defined(__WXPALMOS__)
- return 0;
-#elif defined(__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
- {
- if (GetFileTime(fileHandle, & creationTime, & lastAccessTime, & lastWriteTime))
- {
- CloseHandle(fileHandle);
-
- 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);
+ wxDateTime mtime;
+ if ( !wxFileName(filename).GetTimes(NULL, &mtime, NULL) )
+ return (time_t)-1;
- return buf.st_mtime;
-#endif
+ return mtime.GetTicks();
}
// 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)
+int WXDLLEXPORT wxParseCommonDialogsFilter(const wxString& filterStr,
+ wxArrayString& descriptions,
+ wxArrayString& filters)
{
descriptions.Clear();
filters.Clear();
* Written By Douglas A. Lewis <dalewis@cs.Buffalo.EDU>
*
* The match procedure is public domain code (from ircII's reg.c)
+* but modified to suit our tastes (RN: No "%" syntax I guess)
*/
bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
{
- if (text.empty())
+ if (text.empty())
+ {
+ /* Match if both are empty. */
+ return pat.empty();
+ }
+
+ const wxChar *m = pat.c_str(),
+ *n = text.c_str(),
+ *ma = NULL,
+ *na = NULL;
+ int just = 0,
+ acount = 0,
+ count = 0;
+
+ if (dot_special && (*n == wxT('.')))
+ {
+ /* Never match so that hidden Unix files
+ * are never found. */
+ return false;
+ }
+
+ for (;;)
+ {
+ if (*m == wxT('*'))
{
- /* Match if both are empty. */
- return pat.empty();
+ ma = ++m;
+ na = n;
+ just = 1;
+ acount = count;
}
-
- 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('.')))
+ else if (*m == wxT('?'))
{
- /* Never match so that hidden Unix files
- * are never found. */
+ m++;
+ if (!*n++)
return false;
}
-
- for (;;)
+ else
{
- if (*m == wxT('*'))
- {
- ma = ++m;
- na = n;
- just = 1;
- mp = NULL;
- acount = count;
- }
- else if (*m == wxT('?'))
+ if (*m == wxT('\\'))
+ {
+ m++;
+ /* Quoting "nothing" is a bad thing */
+ if (!*m)
+ return false;
+ }
+ 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++;
+ 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 (ma)
{
- m++;
- if (!*n++)
- return false;
+ m = ma;
+ n = ++na;
+ count = acount;
}
else
- {
- if (*m == wxT('\\'))
- {
- m++;
- /* Quoting "nothing" is a bad thing */
- if (!*m)
- return false;
- }
- 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;
- }
- }
+ return false;
+ }
}
+ }
}
// Return the type of an open file
{
// Note: The watcom rtl dll doesn't have fileno (the static lib does).
// Should be fixed in version 1.4.
-#if defined(wxFILEKIND_STUB) || \
- (defined(__WATCOMC__) && __WATCOMC__ <= 1230 && defined(__SW_BR))
+#if defined(wxFILEKIND_STUB) || wxONLY_WATCOM_EARLIER_THAN(1,4)
(void)fp;
return wxFILE_KIND_DISK;
#else
- return wxGetFileKind(fileno(fp));
+ return fp ? wxGetFileKind(fileno(fp)) : wxFILE_KIND_UNKNOWN;
#endif
}
projects / wxWidgets.git / blobdiff