added FindFileInPath() (part of an otherwise rejected patch)

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

diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp
index 8fab430376ae5ade5f6d42b84c31a44c837e8c61..61ec083da446e7c3728772e64bf26b7faca0f6bb 100644 (file)
--- a/src/common/filesys.cpp
+++ b/src/common/filesys.cpp
@@ -1,31 +1,32 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        filesys.cpp
+// Name:        src/common/filesys.cpp

 // Purpose:     wxFileSystem class - interface for opening files
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
 // CVS-ID:      $Id$
 // Purpose:     wxFileSystem class - interface for opening files
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
 // CVS-ID:      $Id$

-// Licence:     wxWindows Licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "filesys.h"
-#endif
-

 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 
 #if wxUSE_FILESYSTEM
 
 #endif
 
 
 #if wxUSE_FILESYSTEM
 

+#include "wx/filesys.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+#endif
+

 #include "wx/wfstream.h"
 #include "wx/module.h"
 #include "wx/wfstream.h"
 #include "wx/module.h"

-#include "wx/filesys.h"

 #include "wx/mimetype.h"
 #include "wx/filename.h"
 #include "wx/mimetype.h"
 #include "wx/filename.h"

-#include "wx/log.h"
+#include "wx/tokenzr.h"

 
 
 //--------------------------------------------------------------------------------
 
 
 //--------------------------------------------------------------------------------


@@ -39,8 +40,8 @@ wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
 {
     wxString ext, mime;
     wxString loc = GetRightLocation(location);
 {
     wxString ext, mime;
     wxString loc = GetRightLocation(location);

-    char c;
-    int l = loc.Length(), l2;
+    wxChar c;
+    int l = loc.length(), l2;

 
     l2 = l;
     for (int i = l-1; i >= 0; i--)
 
     l2 = l;
     for (int i = l-1; i >= 0; i--)


@@ -64,28 +65,28 @@ wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
         static const wxFileTypeInfo fallbacks[] =
         {
             wxFileTypeInfo(_T("image/jpeg"),
         static const wxFileTypeInfo fallbacks[] =
         {
             wxFileTypeInfo(_T("image/jpeg"),

-                           _T(""),
-                           _T(""),
+                           wxEmptyString,
+                           wxEmptyString,

                            _T("JPEG image (from fallback)"),
                            _T("jpg"), _T("jpeg"), _T("JPG"), _T("JPEG"), NULL),
             wxFileTypeInfo(_T("image/gif"),
                            _T("JPEG image (from fallback)"),
                            _T("jpg"), _T("jpeg"), _T("JPG"), _T("JPEG"), NULL),
             wxFileTypeInfo(_T("image/gif"),

-                           _T(""),
-                           _T(""),
+                           wxEmptyString,
+                           wxEmptyString,

                            _T("GIF image (from fallback)"),
                            _T("gif"), _T("GIF"), NULL),
             wxFileTypeInfo(_T("image/png"),
                            _T("GIF image (from fallback)"),
                            _T("gif"), _T("GIF"), NULL),
             wxFileTypeInfo(_T("image/png"),

-                           _T(""),
-                           _T(""),
+                           wxEmptyString,
+                           wxEmptyString,

                            _T("PNG image (from fallback)"),
                            _T("png"), _T("PNG"), NULL),
             wxFileTypeInfo(_T("image/bmp"),
                            _T("PNG image (from fallback)"),
                            _T("png"), _T("PNG"), NULL),
             wxFileTypeInfo(_T("image/bmp"),

-                           _T(""),
-                           _T(""),
+                           wxEmptyString,
+                           wxEmptyString,

                            _T("windows bitmap image (from fallback)"),
                            _T("bmp"), _T("BMP"), NULL),
             wxFileTypeInfo(_T("text/html"),
                            _T("windows bitmap image (from fallback)"),
                            _T("bmp"), _T("BMP"), NULL),
             wxFileTypeInfo(_T("text/html"),

-                           _T(""),
-                           _T(""),
+                           wxEmptyString,
+                           wxEmptyString,

                            _T("HTML document (from fallback)"),
                            _T("htm"), _T("html"), _T("HTM"), _T("HTML"), NULL),
             // must terminate the table with this!
                            _T("HTML document (from fallback)"),
                            _T("htm"), _T("html"), _T("HTM"), _T("HTML"), NULL),
             // must terminate the table with this!


@@ -105,15 +106,15 @@ wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
 
     return mime;
 #else
 
     return mime;
 #else

-    if ( ext.IsSameAs(wxT("htm"), FALSE) || ext.IsSameAs(_T("html"), FALSE) )
+    if ( ext.IsSameAs(wxT("htm"), false) || ext.IsSameAs(_T("html"), false) )

         return wxT("text/html");
         return wxT("text/html");

-    if ( ext.IsSameAs(wxT("jpg"), FALSE) || ext.IsSameAs(_T("jpeg"), FALSE) )
+    if ( ext.IsSameAs(wxT("jpg"), false) || ext.IsSameAs(_T("jpeg"), false) )

         return wxT("image/jpeg");
         return wxT("image/jpeg");

-    if ( ext.IsSameAs(wxT("gif"), FALSE) )
+    if ( ext.IsSameAs(wxT("gif"), false) )

         return wxT("image/gif");
         return wxT("image/gif");

-    if ( ext.IsSameAs(wxT("png"), FALSE) )
+    if ( ext.IsSameAs(wxT("png"), false) )

         return wxT("image/png");
         return wxT("image/png");

-    if ( ext.IsSameAs(wxT("bmp"), FALSE) )
+    if ( ext.IsSameAs(wxT("bmp"), false) )

         return wxT("image/bmp");
     return wxEmptyString;
 #endif
         return wxT("image/bmp");
     return wxEmptyString;
 #endif


@@ -124,12 +125,11 @@ wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
 wxString wxFileSystemHandler::GetProtocol(const wxString& location) const
 {
     wxString s = wxEmptyString;
 wxString wxFileSystemHandler::GetProtocol(const wxString& location) const
 {
     wxString s = wxEmptyString;

-    int i, l = location.Length();
-    bool fnd;
+    int i, l = location.length();
+    bool fnd = false;

 
 

-    fnd = FALSE;

     for (i = l-1; (i >= 0) && ((location[i] != wxT('#')) || (!fnd)); i--) {
     for (i = l-1; (i >= 0) && ((location[i] != wxT('#')) || (!fnd)); i--) {

-        if ((location[i] == wxT(':')) && (i != 1 /*win: C:\path*/)) fnd = TRUE;
+        if ((location[i] == wxT(':')) && (i != 1 /*win: C:\path*/)) fnd = true;

     }
     if (!fnd) return wxT("file");
     for (++i; (i < l) && (location[i] != wxT(':')); i++) s << location[i];
     }
     if (!fnd) return wxT("file");
     for (++i; (i < l) && (location[i] != wxT(':')); i++) s << location[i];


@@ -140,11 +140,10 @@ wxString wxFileSystemHandler::GetProtocol(const wxString& location) const
 wxString wxFileSystemHandler::GetLeftLocation(const wxString& location) const
 {
     int i;
 wxString wxFileSystemHandler::GetLeftLocation(const wxString& location) const
 {
     int i;

-    bool fnd;
+    bool fnd = false;

 
 

-    fnd = FALSE;
-    for (i = location.Length()-1; i >= 0; i--) {
-        if ((location[i] == wxT(':')) && (i != 1 /*win: C:\path*/)) fnd = TRUE;
+    for (i = location.length()-1; i >= 0; i--) {
+        if ((location[i] == wxT(':')) && (i != 1 /*win: C:\path*/)) fnd = true;

         else if (fnd && (location[i] == wxT('#'))) return location.Left(i);
     }
     return wxEmptyString;
         else if (fnd && (location[i] == wxT('#'))) return location.Left(i);
     }
     return wxEmptyString;


@@ -152,37 +151,24 @@ wxString wxFileSystemHandler::GetLeftLocation(const wxString& location) const
 
 wxString wxFileSystemHandler::GetRightLocation(const wxString& location) const
 {
 
 wxString wxFileSystemHandler::GetRightLocation(const wxString& location) const
 {

-    int i, l = location.Length();
+    int i, l = location.length();

     int l2 = l + 1;
 
     int l2 = l + 1;
 

-    for (i = l-1; 
-         (i >= 0) && 
-         ((location[i] != wxT(':')) || (i == 1) ||
-              (location[i-2] == wxT(':'))
-#ifdef __WXMSW__
-              || ((i > 3) && location[i-4] == wxT(':')) // E.g. file://C:/thing.jpg
-#endif
-              );
+    for (i = l-1;
+         (i >= 0) &&
+         ((location[i] != wxT(':')) || (i == 1) || (location[i-2] == wxT(':')));

          i--)
     {
         if (location[i] == wxT('#')) l2 = i + 1;
     }
          i--)
     {
         if (location[i] == wxT('#')) l2 = i + 1;
     }

-#ifdef __WXMSW__
-    // We may now have //c:/thing.jpg
-    if (((i + 4) < l) && location[i+1] == wxT('/') && location[i+2] == wxT('/') &&
-                         location[i+4] == wxT(':'))
-    {
-        i = i + 2;
-    }
-#endif

     if (i == 0) return wxEmptyString;
     else return location.Mid(i + 1, l2 - i - 2);
 }
 
 wxString wxFileSystemHandler::GetAnchor(const wxString& location) const
 {
     if (i == 0) return wxEmptyString;
     else return location.Mid(i + 1, l2 - i - 2);
 }
 
 wxString wxFileSystemHandler::GetAnchor(const wxString& location) const
 {

-    char c;
-    int l = location.Length();
+    wxChar c;
+    int l = location.length();

 
     for (int i = l-1; i >= 0; i--) {
         c = location[i];
 
     for (int i = l-1; i >= 0; i--) {
         c = location[i];


@@ -275,7 +261,7 @@ static wxString MakeCorrectPath(const wxString& path)
     wxString r;
     int i, j, cnt;
 
     wxString r;
     int i, j, cnt;
 

-    cnt = p.Length();
+    cnt = p.length();

     for (i = 0; i < cnt; i++)
       if (p.GetChar(i) == wxT('\\')) p.GetWritableChar(i) = wxT('/'); // Want to be windows-safe
 
     for (i = 0; i < cnt; i++)
       if (p.GetChar(i) == wxT('\\')) p.GetWritableChar(i) = wxT('/'); // Want to be windows-safe
 


@@ -294,7 +280,7 @@ static wxString MakeCorrectPath(const wxString& path)
         r << p.GetChar(i);
         if (p.GetChar(i) == wxT('/') && p.GetChar(i-1) == wxT('.') && p.GetChar(i-2) == wxT('.'))
         {
         r << p.GetChar(i);
         if (p.GetChar(i) == wxT('/') && p.GetChar(i-1) == wxT('.') && p.GetChar(i-2) == wxT('.'))
         {

-            for (j = r.Length() - 2; j >= 0 && r.GetChar(j) != wxT('/') && r.GetChar(j) != wxT(':'); j--) {}
+            for (j = r.length() - 2; j >= 0 && r.GetChar(j) != wxT('/') && r.GetChar(j) != wxT(':'); j--) {}

             if (j >= 0 && r.GetChar(j) != wxT(':'))
             {
                 for (j = j - 1; j >= 0 && r.GetChar(j) != wxT('/') && r.GetChar(j) != wxT(':'); j--) {}
             if (j >= 0 && r.GetChar(j) != wxT(':'))
             {
                 for (j = j - 1; j >= 0 && r.GetChar(j) != wxT('/') && r.GetChar(j) != wxT(':'); j--) {}


@@ -317,13 +303,13 @@ void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir)
 
     if (is_dir)
     {
 
     if (is_dir)
     {

-        if (m_Path.Length() > 0 && m_Path.Last() != wxT('/') && m_Path.Last() != wxT(':'))
+        if (m_Path.length() > 0 && m_Path.Last() != wxT('/') && m_Path.Last() != wxT(':'))

             m_Path << wxT('/');
     }
 
     else
     {
             m_Path << wxT('/');
     }
 
     else
     {

-        for (i = m_Path.Length()-1; i >= 0; i--)
+        for (i = m_Path.length()-1; i >= 0; i--)

         {
             if (m_Path[(unsigned int) i] == wxT('/'))
             {
         {
             if (m_Path[(unsigned int) i] == wxT('/'))
             {


@@ -345,7 +331,7 @@ void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir)
         }
         if (pathpos == -1)
         {
         }
         if (pathpos == -1)
         {

-            for (i = 0; i < (int) m_Path.Length(); i++)
+            for (i = 0; i < (int) m_Path.length(); i++)

             {
                 if (m_Path[(unsigned int) i] == wxT(':'))
                 {
             {
                 if (m_Path[(unsigned int) i] == wxT(':'))
                 {


@@ -353,7 +339,7 @@ void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir)
                     break;
                 }
             }
                     break;
                 }
             }

-            if (i == (int) m_Path.Length())
+            if (i == (int) m_Path.length())

                 m_Path = wxEmptyString;
         }
         else
                 m_Path = wxEmptyString;
         }
         else


@@ -369,11 +355,11 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location)
 {
     wxString loc = MakeCorrectPath(location);
     unsigned i, ln;
 {
     wxString loc = MakeCorrectPath(location);
     unsigned i, ln;

-    char meta;
+    wxChar meta;

     wxFSFile *s = NULL;
     wxList::compatibility_iterator node;
 
     wxFSFile *s = NULL;
     wxList::compatibility_iterator node;
 

-    ln = loc.Length();
+    ln = loc.length();

     meta = 0;
     for (i = 0; i < ln; i++)
     {
     meta = 0;
     for (i = 0; i < ln; i++)
     {


@@ -430,7 +416,7 @@ wxString wxFileSystem::FindFirst(const wxString& spec, int flags)
 
     m_FindFileHandler = NULL;
 
 
     m_FindFileHandler = NULL;
 

-    for (int i = spec2.Length()-1; i >= 0; i--)
+    for (int i = spec2.length()-1; i >= 0; i--)

         if (spec2[(unsigned int) i] == wxT('\\')) spec2.GetWritableChar(i) = wxT('/'); // Want to be windows-safe
 
     node = m_Handlers.GetFirst();
         if (spec2[(unsigned int) i] == wxT('\\')) spec2.GetWritableChar(i) = wxT('/'); // Want to be windows-safe
 
     node = m_Handlers.GetFirst();


@@ -462,7 +448,37 @@ wxString wxFileSystem::FindNext()
     else return m_FindFileHandler -> FindNext();
 }
 
     else return m_FindFileHandler -> FindNext();
 }
 

+bool wxFileSystem::FindFileInPath(wxString *pStr,
+                                  const wxChar *path,
+                                  const wxChar *basename)
+{
+    // we assume that it's not empty
+    wxCHECK_MSG( !wxIsEmpty(basename), false,
+                _T("empty file name in wxFileSystem::FindFileInPath"));

 
 

+    // skip path separator in the beginning of the file name if present
+    if ( wxIsPathSeparator(*basename) )
+       basename++;
+
+    wxStringTokenizer tokenizer(path, wxPATH_SEP);
+    while ( tokenizer.HasMoreTokens() )
+    {
+        wxString strFile = tokenizer.GetNextToken();
+        if ( !wxEndsWithPathSeparator(strFile) )
+            strFile += wxFILE_SEP_PATH;
+        strFile += basename;
+
+        wxFSFile *file = OpenFile(strFile);
+        if ( file )
+        {
+            delete file;
+            *pStr = strFile;
+            return true;
+        }
+    }
+
+    return false;
+}

 
 void wxFileSystem::AddHandler(wxFileSystemHandler *handler)
 {
 
 void wxFileSystem::AddHandler(wxFileSystemHandler *handler)
 {


@@ -475,50 +491,50 @@ void wxFileSystem::CleanUpHandlers()
     WX_CLEAR_LIST(wxList, m_Handlers);
 }
 
     WX_CLEAR_LIST(wxList, m_Handlers);
 }
 

-const static wxString g_unixPathString(wxT("/"));
-const static wxString g_nativePathString(wxFILE_SEP_PATH);
+static const wxString g_unixPathString(wxT("/"));
+static const wxString g_nativePathString(wxFILE_SEP_PATH);

 
 // Returns the native path for a file URL
 wxFileName wxFileSystem::URLToFileName(const wxString& url)
 {
 
 // Returns the native path for a file URL
 wxFileName wxFileSystem::URLToFileName(const wxString& url)
 {

-       wxString path = url;
+    wxString path = url;

 
 

-       if ( path.Find(wxT("file://")) == 0 )
-       {
-               path = path.Mid(7);
-       }
+    if ( path.Find(wxT("file://")) == 0 )
+    {
+        path = path.Mid(7);
+    }

     else if ( path.Find(wxT("file:")) == 0 )
     else if ( path.Find(wxT("file:")) == 0 )

-       {
-               path = path.Mid(5);
-       }
-       // Remove preceding double slash on Mac Classic
+    {
+        path = path.Mid(5);
+    }
+    // Remove preceding double slash on Mac Classic

 #if defined(__WXMAC__) && !defined(__UNIX__)
     else if ( path.Find(wxT("//")) == 0 )
         path = path.Mid(2);
 #endif
 #if defined(__WXMAC__) && !defined(__UNIX__)
     else if ( path.Find(wxT("//")) == 0 )
         path = path.Mid(2);
 #endif

-    
+

     path.Replace(wxT("%25"), wxT("%"));
     path.Replace(wxT("%3A"), wxT(":"));
 
 #ifdef __WXMSW__
     path.Replace(wxT("%25"), wxT("%"));
     path.Replace(wxT("%3A"), wxT(":"));
 
 #ifdef __WXMSW__

-       // file urls either start with a forward slash (local harddisk),
+    // file urls either start with a forward slash (local harddisk),

     // otherwise they have a servername/sharename notation,
     // which only exists on msw and corresponds to a unc
     // otherwise they have a servername/sharename notation,
     // which only exists on msw and corresponds to a unc

-       if ( path[0u] == wxT('/') && path [1u] != wxT('/'))
-       {
-               path = path.Mid(1);
-       }
-       else if ( (url.Find(wxT("file://")) == 0) &&
+    if ( path[0u] == wxT('/') && path [1u] != wxT('/'))
+    {
+        path = path.Mid(1);
+    }
+    else if ( (url.Find(wxT("file://")) == 0) &&

               (path.Find(wxT('/')) != wxNOT_FOUND) &&
               (path.Find(wxT('/')) != wxNOT_FOUND) &&

-              (path.Length() > 1) && (path[1u] != wxT(':')) )
-       {
-               path = wxT("//") + path;
-       }
+              (path.length() > 1) && (path[1u] != wxT(':')) )
+    {
+        path = wxT("//") + path;
+    }

 #endif
 
 #endif
 

-       path.Replace(g_unixPathString, g_nativePathString);
+    path.Replace(g_unixPathString, g_nativePathString);

 
 

-       return wxFileName(path, wxPATH_NATIVE);
+    return wxFileName(path, wxPATH_NATIVE);

 }
 
 // Returns the file URL for a native path
 }
 
 // Returns the file URL for a native path


@@ -530,9 +546,9 @@ wxString wxFileSystem::FileNameToURL(const wxFileName& filename)
 
 #ifndef __UNIX__
     // unc notation, wxMSW
 
 #ifndef __UNIX__
     // unc notation, wxMSW

-    if ( url.Find(wxT("\\\\")) == 0 ) 
+    if ( url.Find(wxT("\\\\")) == 0 )

     {
     {

-        url = url.Mid(2);
+        url = wxT("//") + url.Mid(2);

     }
     else
     {
     }
     else
     {


@@ -574,6 +590,3 @@ IMPLEMENT_DYNAMIC_CLASS(wxFileSystemModule, wxModule)
 
 #endif
   // wxUSE_FILESYSTEM
 
 #endif
   // wxUSE_FILESYSTEM

-
-
-