Changed the "delete win" to the more proper "win->Destroy()" in

[wxWidgets.git] / src / common / filefn.cpp

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index cb4b81d8180a0354f89f2a4bbf88dce2c8a40cb0..0a7d12ab7bbb36ea96d814a9a53672bf23ecd53a 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -28,6 +28,11 @@
 #include "wx/utils.h"
 #include <wx/intl.h>
 
 #include "wx/utils.h"
 #include <wx/intl.h>
 

+// there are just too many of those...
+#ifdef _MSC_VER
+    #pragma warning(disable:4706)   // assignment within conditional expression
+#endif // VC++
+

 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>


@@ -55,12 +60,6 @@
 
 #ifdef __GNUWIN32__
 #include <sys/unistd.h>
 
 #ifdef __GNUWIN32__
 #include <sys/unistd.h>

-// #include <sys/stat.h>
-
-#ifndef __MINGW32__
-#include <std.h>
-#endif
-

 #define stricmp strcasecmp
 #endif
 
 #define stricmp strcasecmp
 #endif
 


@@ -70,18 +69,23 @@
 #include <dir.h>
 #endif
 
 #include <dir.h>
 #endif
 

+#include "wx/setup.h"
+#ifdef HAVE_FNMATCH_H
+#include   "fnmatch.h"
+#endif
+

 #ifdef __WINDOWS__
 #include "windows.h"
 #endif
 
 #define _MAXPATHLEN 500
 
 #ifdef __WINDOWS__
 #include "windows.h"
 #endif
 
 #define _MAXPATHLEN 500
 

-#if !USE_SHARED_LIBRARY
+extern char *wxBuffer;
+
+#if !USE_SHARED_LIBRARIES

 IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxStringList)
 #endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxStringList)
 #endif
 

-extern char *wxBuffer;
-

 void wxPathList::Add (const wxString& path)
 {
   wxStringList::Add ((char *)(const char *)path);
 void wxPathList::Add (const wxString& path)
 {
   wxStringList::Add ((char *)(const char *)path);


@@ -108,7 +112,7 @@ void wxPathList::AddEnvList (const wxString& envVariable)
          Add (copystring (token));
          while (token)
            {
          Add (copystring (token));
          while (token)
            {

-             if ((token = strtok (NULL, PATH_TOKS)) != NULL)
+             if ((token = strtok ((char *) NULL, PATH_TOKS)) != NULL)

                Add (wxString(token));
            }
        }
                Add (wxString(token));
            }
        }


@@ -209,11 +213,18 @@ wxString wxPathList::FindAbsoluteValidPath (const wxString& file)
 bool 
 wxFileExists (const wxString& filename)
 {
 bool 
 wxFileExists (const wxString& filename)
 {

+#ifdef __GNUWIN32__ // (fix a B20 bug)
+  if (GetFileAttributes(filename) == 0xFFFFFFFF)
+    return FALSE;
+  else
+    return TRUE;
+#else

   struct stat stbuf;
 
   if (filename && stat ((char *)(const char *)filename, &stbuf) == 0)
     return TRUE;
   return FALSE;
   struct stat stbuf;
 
   if (filename && stat ((char *)(const char *)filename, &stbuf) == 0)
     return TRUE;
   return FALSE;

+#endif

 }
 
 /* Vadim's alternative implementation
 }
 
 /* Vadim's alternative implementation


@@ -339,7 +350,7 @@ char *wxRealPath (char *path)
 char *wxCopyAbsolutePath(const wxString& filename)
 {
   if (filename == "")
 char *wxCopyAbsolutePath(const wxString& filename)
 {
   if (filename == "")

-    return NULL;
+    return (char *) NULL;

 
   if (! IsAbsolutePath(wxExpandPath(wxBuffer, filename))) {
     char    buf[_MAXPATHLEN];
 
   if (! IsAbsolutePath(wxExpandPath(wxBuffer, filename))) {
     char    buf[_MAXPATHLEN];


@@ -442,7 +453,7 @@ char *wxExpandPath(char *buf, const char *name)
 #endif
        {
            register char  *start = d;
 #endif
        {
            register char  *start = d;

-           register        braces = (*s == '{' || *s == '(');
+           register int   braces = (*s == '{' || *s == '(');

            register char  *value;
            while ((*d++ = *s))
                if (braces ? (*s == '}' || *s == ')') : !(isalnum(*s) || *s == '_') )
            register char  *value;
            while ((*d++ = *s))
                if (braces ? (*s == '}' || *s == ')') : !(isalnum(*s) || *s == '_') )


@@ -523,7 +534,7 @@ wxContractPath (const wxString& filename, const wxString& envname, const wxStrin
   static char dest[_MAXPATHLEN];
 
   if (filename == "")
   static char dest[_MAXPATHLEN];
 
   if (filename == "")

-    return NULL;
+    return (char *) NULL;

 
   strcpy (dest, WXSTRINGCAST filename);
 #ifdef __WXMSW__
 
   strcpy (dest, WXSTRINGCAST filename);
 #ifdef __WXMSW__


@@ -531,9 +542,9 @@ wxContractPath (const wxString& filename, const wxString& envname, const wxStrin
 #endif
 
   // Handle environment
 #endif
 
   // Handle environment

-  char *val = NULL;
-  char *tcp = NULL;
-  if (envname != NULL && (val = getenv (WXSTRINGCAST envname)) != NULL &&
+  char *val = (char *) NULL;
+  char *tcp = (char *) NULL;
+  if (envname != WXSTRINGCAST NULL && (val = getenv (WXSTRINGCAST envname)) != NULL &&

      (tcp = strstr (dest, val)) != NULL)
     {
         strcpy (wxBuffer, tcp + strlen (val));
      (tcp = strstr (dest, val)) != NULL)
     {
         strcpy (wxBuffer, tcp + strlen (val));


@@ -665,7 +676,7 @@ wxPathOnly (char *path)
 #endif
     }
 
 #endif
     }
 

-  return NULL;
+  return (char *) NULL;

 }
 
 // Return just the directory, or NULL if no directory
 }
 
 // Return just the directory, or NULL if no directory


@@ -761,9 +772,9 @@ wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& fil
 {
   char *outfile = wxGetTempFileName("cat");
 
 {
   char *outfile = wxGetTempFileName("cat");
 

-  FILE *fp1 = NULL;
-  FILE *fp2 = NULL;
-  FILE *fp3 = NULL;
+  FILE *fp1 = (FILE *) NULL;
+  FILE *fp2 = (FILE *) NULL;
+  FILE *fp3 = (FILE *) NULL;

   // Open the inputs and outputs
   if ((fp1 = fopen (WXSTRINGCAST file1, "rb")) == NULL ||
       (fp2 = fopen (WXSTRINGCAST file2, "rb")) == NULL ||
   // Open the inputs and outputs
   if ((fp1 = fopen (WXSTRINGCAST file1, "rb")) == NULL ||
       (fp2 = fopen (WXSTRINGCAST file2, "rb")) == NULL ||


@@ -944,7 +955,7 @@ char *wxGetTempFileName(const wxString& prefix, char *buf)
 #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.
 #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.

-  char tmp[100];
+  char tmp[100]; // FIXME static buffer

 
   for (short suffix = last_temp + 1; suffix != last_temp; ++suffix %= 1000)
     {
 
   for (short suffix = last_temp + 1; suffix != last_temp; ++suffix %= 1000)
     {


@@ -965,7 +976,7 @@ char *wxGetTempFileName(const wxString& prefix, char *buf)
     }
   cerr << _("wxWindows: error finding temporary file name.\n");
   if (buf) buf[0] = 0;
     }
   cerr << _("wxWindows: error finding temporary file name.\n");
   if (buf) buf[0] = 0;

-  return NULL;
+  return (char *) NULL;

 #endif
 }
 
 #endif
 }
 


@@ -977,8 +988,8 @@ char *wxGetTempFileName(const wxString& prefix, char *buf)
 // Flags are reserved for future use.
 
 #ifndef __VMS__
 // Flags are reserved for future use.
 
 #ifndef __VMS__

-static DIR *wxDirStream = NULL;
-static char *wxFileSpec = NULL;
+static DIR *wxDirStream = (DIR *) NULL;
+static char *wxFileSpec = (char *) NULL;

 static int wxFindFileFlags = 0;
 #endif
 
 static int wxFindFileFlags = 0;
 #endif
 


@@ -1006,23 +1017,23 @@ char *wxFindFirstFile(const char *spec, int flags)
     p = ".";
     
   if ((wxDirStream=opendir(p))==NULL)
     p = ".";
     
   if ((wxDirStream=opendir(p))==NULL)

-    return NULL;
+    return (char *) NULL;

 
  /* MATTHEW: [5] wxFindNextFile can do the rest of the work */
   return wxFindNextFile();
 #endif
  // ifndef __VMS__
 
  /* MATTHEW: [5] wxFindNextFile can do the rest of the work */
   return wxFindNextFile();
 #endif
  // ifndef __VMS__

-  return NULL;
+  return (char *) NULL;

 }
 
 char *wxFindNextFile(void)
 {
 #ifndef __VMS__
 }
 
 char *wxFindNextFile(void)
 {
 #ifndef __VMS__

-  static char buf[400];
+  static char buf[400]; // FIXME static buffer

 
   /* MATTHEW: [2] Don't crash if we read too many times */
   if (!wxDirStream)
 
   /* MATTHEW: [2] Don't crash if we read too many times */
   if (!wxDirStream)

-    return NULL;
+    return (char *) NULL;

 
   // Find path only so we can concatenate
   // found file onto path
 
   // Find path only so we can concatenate
   // found file onto path


@@ -1066,11 +1077,11 @@ char *wxFindNextFile(void)
     }
   }
   closedir(wxDirStream);
     }
   }
   closedir(wxDirStream);

-  wxDirStream = NULL;
+  wxDirStream = (DIR *) NULL;

 #endif
  // ifndef __VMS__
 
 #endif
  // ifndef __VMS__
 

-  return NULL;
+  return (char *) NULL;

 }
 
 #elif defined(__WXMSW__)
 }
 
 #elif defined(__WXMSW__)


@@ -1319,7 +1330,7 @@ bool wxFindFileInPath(wxString *pStr, const char *pszPath, const char *pszFile)
 
   wxString strFile;
   char *pc;
 
   wxString strFile;
   char *pc;

-  for ( pc = strtok(szPath, PATH_SEP); pc; pc = strtok(NULL, PATH_SEP) ) {
+  for ( pc = strtok(szPath, PATH_SEP); pc; pc = strtok((char *) NULL, PATH_SEP) ) {

     // search for the file in this directory
     strFile = pc;
     if ( !wxEndsWithPathSeparator(pc) )
     // search for the file in this directory
     strFile = pc;
     if ( !wxEndsWithPathSeparator(pc) )


@@ -1349,16 +1360,16 @@ void WXDLLEXPORT wxSplitPath(const char *pszFileName,
   const char *pSepDos = strrchr(pszFileName, FILE_SEP_PATH_DOS);
 
   // take the last of the two
   const char *pSepDos = strrchr(pszFileName, FILE_SEP_PATH_DOS);
 
   // take the last of the two

-  uint nPosUnix = pSepUnix ? pSepUnix - pszFileName : 0;
-  uint nPosDos = pSepDos ? pSepDos - pszFileName : 0;
+  size_t nPosUnix = pSepUnix ? pSepUnix - pszFileName : 0;
+  size_t nPosDos = pSepDos ? pSepDos - pszFileName : 0;

   if ( nPosDos > nPosUnix )
     nPosUnix = nPosDos;
   if ( nPosDos > nPosUnix )
     nPosUnix = nPosDos;

-//  uint nLen = Strlen(pszFileName);
+//  size_t nLen = Strlen(pszFileName);

 
   if ( pstrPath )
     *pstrPath = wxString(pszFileName, nPosUnix);
   if ( pDot ) {
 
   if ( pstrPath )
     *pstrPath = wxString(pszFileName, nPosUnix);
   if ( pDot ) {

-    uint nPosDot = pDot - pszFileName;
+    size_t nPosDot = pDot - pszFileName;

     if ( pstrName )
       *pstrName = wxString(pszFileName + nPosUnix + 1, nPosDot - nPosUnix);
     if ( pstrExt )
     if ( pstrName )
       *pstrName = wxString(pszFileName + nPosUnix + 1, nPosDot - nPosUnix);
     if ( pstrExt )


@@ -1371,3 +1382,177 @@ void WXDLLEXPORT wxSplitPath(const char *pszFileName,
       pstrExt->Empty();
   }
 }
       pstrExt->Empty();
   }
 }

+
+//------------------------------------------------------------------------
+// wild character routines
+//------------------------------------------------------------------------
+
+bool wxIsWild( const wxString& pattern )
+{
+  wxString tmp = pattern;
+  char *pat = WXSTRINGCAST(tmp);
+    while (*pat) {
+       switch (*pat++) {
+       case '?': case '*': case '[': case '{':
+           return TRUE;
+       case '\\':
+           if (!*pat++)
+               return FALSE;
+       }
+    }
+    return FALSE;
+};
+
+bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
+#ifdef HAVE_FNMATCH_H
+{
+   if(dot_special)
+      return fnmatch(pat.c_str(), text.c_str(), FNM_PERIOD) == 0;
+   else
+      return fnmatch(pat.c_str(), text.c_str(), 0) == 0;
+}
+#else
+
+#pragma error Broken implementation of wxMatchWild() -- needs fixing!
+   /*
+    * WARNING: this code is broken!
+    */
+{
+  wxString tmp1 = pat;
+  char *pattern = WXSTRINGCAST(tmp1);
+  wxString tmp2 = text;
+  char *str = WXSTRINGCAST(tmp2);
+    char c;
+    char *cp;
+    bool done = FALSE, ret_code, ok;
+    // Below is for vi fans
+    const char OB = '{', CB = '}';
+
+    // dot_special means '.' only matches '.'
+    if (dot_special && *str == '.' && *pattern != *str)
+       return FALSE;
+
+    while ((*pattern != '\0') && (!done)
+    && (((*str=='\0')&&((*pattern==OB)||(*pattern=='*')))||(*str!='\0'))) {
+       switch (*pattern) {
+       case '\\':
+           pattern++;
+           if (*pattern != '\0')
+               pattern++;
+           break;
+       case '*':
+           pattern++;
+           ret_code = FALSE;
+           while ((*str!='\0')
+           && (!(ret_code=wxMatchWild(pattern, str++, FALSE))))
+               /*loop*/;
+           if (ret_code) {
+               while (*str != '\0')
+                   str++;
+               while (*pattern != '\0')
+                   pattern++;
+           }
+           break;
+       case '[':
+           pattern++;
+         repeat:
+           if ((*pattern == '\0') || (*pattern == ']')) {
+               done = TRUE;
+               break;
+           }
+           if (*pattern == '\\') {
+               pattern++;
+               if (*pattern == '\0') {
+                   done = TRUE;
+                   break;
+               }
+           }
+           if (*(pattern + 1) == '-') {
+               c = *pattern;
+               pattern += 2;
+               if (*pattern == ']') {
+                   done = TRUE;
+                   break;
+               }
+               if (*pattern == '\\') {
+                   pattern++;
+                   if (*pattern == '\0') {
+                       done = TRUE;
+                       break;
+                   }
+               }
+               if ((*str < c) || (*str > *pattern)) {
+                   pattern++;
+                   goto repeat;
+               }
+           } else if (*pattern != *str) {
+               pattern++;
+               goto repeat;
+           }
+           pattern++;
+           while ((*pattern != ']') && (*pattern != '\0')) {
+               if ((*pattern == '\\') && (*(pattern + 1) != '\0'))
+                   pattern++;
+               pattern++;
+           }
+           if (*pattern != '\0') {
+               pattern++, str++;
+           }
+           break;
+       case '?':
+           pattern++;
+           str++;
+           break;
+       case OB:
+           pattern++;
+           while ((*pattern != CB) && (*pattern != '\0')) {
+               cp = str;
+               ok = TRUE;
+               while (ok && (*cp != '\0') && (*pattern != '\0')
+               &&  (*pattern != ',') && (*pattern != CB)) {
+                   if (*pattern == '\\')
+                       pattern++;
+                   ok = (*pattern++ == *cp++);
+               }
+               if (*pattern == '\0') {
+                   ok = FALSE;
+                   done = TRUE;
+                   break;
+               } else if (ok) {
+                   str = cp;
+                   while ((*pattern != CB) && (*pattern != '\0')) {
+                       if (*++pattern == '\\') {
+                           if (*++pattern == CB)
+                               pattern++;
+                       }
+                   }
+               } else {
+                   while (*pattern!=CB && *pattern!=',' && *pattern!='\0') {
+                       if (*++pattern == '\\') {
+                            if (*++pattern == CB || *pattern == ',')
+                               pattern++;
+                       }
+                   }
+               }
+               if (*pattern != '\0')
+                   pattern++;
+           }
+           break;
+       default:
+           if (*str == *pattern) {
+               str++, pattern++;
+           } else {
+               done = TRUE;
+           }
+       }
+    }
+    while (*pattern == '*')
+       pattern++;
+    return ((*str == '\0') && (*pattern == '\0'));
+};
+
+#endif
+
+#ifdef _MSC_VER
+    #pragma warning(default:4706)   // assignment within conditional expression
+#endif // VC++