another segfault fix

[wxWidgets.git] / src / html / helpdata.cpp

diff --git a/src/html/helpdata.cpp b/src/html/helpdata.cpp
index 7c362ef056ac0f5f999fabbaa06e336f81663422..11af5d51dc81a27e1d7ac9004af5cd73fd2056bc 100644 (file)
--- a/src/html/helpdata.cpp
+++ b/src/html/helpdata.cpp
@@ -25,7 +25,8 @@
 #if wxUSE_HTML && wxUSE_STREAMS
 
 #ifndef WXPRECOMP
 #if wxUSE_HTML && wxUSE_STREAMS
 
 #ifndef WXPRECOMP

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

 #endif
 
 #include "wx/html/helpdata.h"
 #endif
 
 #include "wx/html/helpdata.h"


@@ -37,6 +38,7 @@
 #include "wx/log.h"
 #include "wx/html/htmlpars.h"
 #include "wx/html/htmldefs.h"
 #include "wx/log.h"
 #include "wx/html/htmlpars.h"
 #include "wx/html/htmldefs.h"

+#include "wx/filename.h"

 
 #include "wx/arrimpl.cpp"
 WX_DEFINE_OBJARRAY(wxHtmlBookRecArray)
 
 #include "wx/arrimpl.cpp"
 WX_DEFINE_OBJARRAY(wxHtmlBookRecArray)


@@ -61,7 +63,7 @@ static char* ReadLine(char *line, char *buf)
 
 static int LINKAGEMODE IndexCompareFunc(const void *a, const void *b)
 {
 
 static int LINKAGEMODE IndexCompareFunc(const void *a, const void *b)
 {

-    return wxStrcmp(((wxHtmlContentsItem*)a)->m_Name, ((wxHtmlContentsItem*)b)->m_Name);
+    return wxStricmp(((wxHtmlContentsItem*)a)->m_Name, ((wxHtmlContentsItem*)b)->m_Name);

 }
 
 
 }
 
 


@@ -71,9 +73,10 @@ static int LINKAGEMODE IndexCompareFunc(const void *a, const void *b)
 
 class HP_Parser : public wxHtmlParser
 {
 
 class HP_Parser : public wxHtmlParser
 {

-    public:
-        void AddText(const char* WXUNUSED(text)) { }
-        wxObject* GetProduct() { return NULL; }
+public:
+    wxObject* GetProduct() { return NULL; }
+protected:
+    virtual void AddText(const wxChar* WXUNUSED(txt)) {}

 };
 
 
 };
 
 


@@ -93,9 +96,9 @@ class HP_TagHandler : public wxHtmlTagHandler
         wxHtmlBookRecord *m_Book;
 
     public:
         wxHtmlBookRecord *m_Book;
 
     public:

-        HP_TagHandler(wxHtmlBookRecord *b) : wxHtmlTagHandler() 
-               { m_Book = b; m_Items = NULL; m_ItemsCnt = 0; m_Name = m_Page = wxEmptyString; 
-                     m_Level = 0; m_ID = -1; }
+        HP_TagHandler(wxHtmlBookRecord *b) : wxHtmlTagHandler()
+            { m_Book = b; m_Items = NULL; m_ItemsCnt = 0; m_Name = m_Page = wxEmptyString;
+              m_Level = 0; m_ID = -1; }

         wxString GetSupportedTags() { return wxT("UL,OBJECT,PARAM"); }
         bool HandleTag(const wxHtmlTag& tag);
         void WriteOut(wxHtmlContentsItem*& array, int& size);
         wxString GetSupportedTags() { return wxT("UL,OBJECT,PARAM"); }
         bool HandleTag(const wxHtmlTag& tag);
         void WriteOut(wxHtmlContentsItem*& array, int& size);


@@ -105,40 +108,44 @@ class HP_TagHandler : public wxHtmlTagHandler
 
 bool HP_TagHandler::HandleTag(const wxHtmlTag& tag)
 {
 
 bool HP_TagHandler::HandleTag(const wxHtmlTag& tag)
 {

-    if (tag.GetName() == wxT("UL")) 
+    if (tag.GetName() == wxT("UL"))

     {
         m_Level++;
         ParseInner(tag);
         m_Level--;
         return TRUE;
     }
     {
         m_Level++;
         ParseInner(tag);
         m_Level--;
         return TRUE;
     }

-    else if (tag.GetName() == wxT("OBJECT")) 
+    else if (tag.GetName() == wxT("OBJECT"))

     {
         m_Name = m_Page = wxEmptyString;
         ParseInner(tag);
 
     {
         m_Name = m_Page = wxEmptyString;
         ParseInner(tag);
 

-        if (!m_Page.IsEmpty())
-        /* should be 'if (tag.GetParam("TYPE") == "text/sitemap")'
-           but this works fine. Valid HHW's file may contain only two
-           object tags:
-           
+#if 0
+         if (!m_Page.IsEmpty())
+        /* Valid HHW's file may contain only two object tags:
+

            <OBJECT type="text/site properties">
                <param name="ImageType" value="Folder">
            </OBJECT>
            <OBJECT type="text/site properties">
                <param name="ImageType" value="Folder">
            </OBJECT>

-           
+

            or
            or

-           
-              <OBJECT type="text/sitemap">
-                      <param name="Name" value="main page">
-                      <param name="Local" value="another.htm">
-                  </OBJECT>
-           
+
+           <OBJECT type="text/sitemap">
+               <param name="Name" value="main page">
+               <param name="Local" value="another.htm">
+           </OBJECT>
+

            We're interested in the latter. !m_Page.IsEmpty() is valid
            condition because text/site properties does not contain Local param
         */
            We're interested in the latter. !m_Page.IsEmpty() is valid
            condition because text/site properties does not contain Local param
         */

+#endif
+        if (tag.GetParam(wxT("TYPE")) == wxT("text/sitemap"))

         {
             if (m_ItemsCnt % wxHTML_REALLOC_STEP == 0)
         {
             if (m_ItemsCnt % wxHTML_REALLOC_STEP == 0)

-                m_Items = (wxHtmlContentsItem*) realloc(m_Items, (m_ItemsCnt + wxHTML_REALLOC_STEP) * sizeof(wxHtmlContentsItem));
+                m_Items = (wxHtmlContentsItem*) realloc(m_Items,
+                                       (m_ItemsCnt + wxHTML_REALLOC_STEP) *
+                                       sizeof(wxHtmlContentsItem));
+

             m_Items[m_ItemsCnt].m_Level = m_Level;
             m_Items[m_ItemsCnt].m_ID = m_ID;
             m_Items[m_ItemsCnt].m_Page = new wxChar[m_Page.Length() + 1];
             m_Items[m_ItemsCnt].m_Level = m_Level;
             m_Items[m_ItemsCnt].m_ID = m_ID;
             m_Items[m_ItemsCnt].m_Page = new wxChar[m_Page.Length() + 1];


@@ -151,126 +158,14 @@ bool HP_TagHandler::HandleTag(const wxHtmlTag& tag)
 
         return TRUE;
     }
 
         return TRUE;
     }

-    else 
+    else

     { // "PARAM"
     { // "PARAM"

-        if (m_Name == wxEmptyString && tag.GetParam(wxT("NAME")) == wxT("Name")) 
-        {
+        if (m_Name == wxEmptyString && tag.GetParam(wxT("NAME")) == wxT("Name"))

             m_Name = tag.GetParam(wxT("VALUE"));
             m_Name = tag.GetParam(wxT("VALUE"));

-            if (m_Name.Find(wxT('&')) != -1) 
-            {
-        #define ESCSEQ(escape, subst)  \
-                          { _T("&") _T(escape) _T(";"), _T("&") _T(escape) _T(" "), _T(subst) } 
-                static wxChar* substitutions[][3] = 
-                        {
-                        ESCSEQ("quot", "\""),
-                        ESCSEQ("lt", "<"),
-                        ESCSEQ("gt", ">"),
-
-                        ESCSEQ("nbsp", " "),
-                        ESCSEQ("iexcl", "!"),
-                        ESCSEQ("cent", "¢"),
-
-                        ESCSEQ("yen", " "),
-                        ESCSEQ("brkbar", " "),
-                        ESCSEQ("sect", " "),
-                        ESCSEQ("uml", " "),
-
-                        ESCSEQ("copy", "(c)"),
-                        ESCSEQ("ordf", " "),
-                        ESCSEQ("laquo", " "),
-                        ESCSEQ("not", " "),
-
-                        ESCSEQ("reg", "(r)"),
-
-                        ESCSEQ("deg", " "),
-                        ESCSEQ("plusm", " "),
-
-                        ESCSEQ("acute", " "),
-                        ESCSEQ("micro", " "),
-                        ESCSEQ("para", " "),
-
-                        ESCSEQ("ordm", " "),
-                        ESCSEQ("raquo", " "),
-
-                        ESCSEQ("iquest", " "),
-                        ESCSEQ("Agrave", "À"),
-
-                        ESCSEQ("Acirc", "Â"),
-                        ESCSEQ("Atilde", "Ã"),
-                        ESCSEQ("Auml", "Ä"),
-                        ESCSEQ("Aring", " "),
-                        ESCSEQ("AElig", " "),
-                        ESCSEQ("Ccedil", "ç"),
-                        ESCSEQ("Egrave", "È"),
-                        ESCSEQ("Eacute", "É"),
-                        ESCSEQ("Ecirc", "Ê"),
-                        ESCSEQ("Euml", "Ë"),
-                        ESCSEQ("Igrave", "Ì"),
-
-                        ESCSEQ("Icirc", "Î"),
-                        ESCSEQ("Iuml", "Ï"),
-
-                        ESCSEQ("Ntilde", "Ñ"),
-                        ESCSEQ("Ograve", "Ò"),
-
-                        ESCSEQ("Ocirc", "Ô"),
-                        ESCSEQ("Otilde", "Õ"),
-                        ESCSEQ("Ouml", "Ö"),
-
-                        ESCSEQ("Oslash", " "),
-                        ESCSEQ("Ugrave", "Ù"),
-
-                        ESCSEQ("Ucirc", " "),
-                        ESCSEQ("Uuml", "Ü"),
-
-                        ESCSEQ("szlig", "§"),
-                        ESCSEQ("agrave;","à"),
-                        ESCSEQ("aacute", "á"),
-                        ESCSEQ("acirc", "â"),
-                        ESCSEQ("atilde", "ã"),
-                        ESCSEQ("auml", "ä"),
-                        ESCSEQ("aring", "a"),
-                        ESCSEQ("aelig", "ae"),
-                        ESCSEQ("ccedil", "ç"),
-                        ESCSEQ("egrave", "è"),
-                        ESCSEQ("eacute", "é"),
-                        ESCSEQ("ecirc", "ê"),
-                        ESCSEQ("euml", "ë"),
-                        ESCSEQ("igrave", "ì"),
-                        ESCSEQ("iacute", "í"),
-                        ESCSEQ("icirc", " "),
-                        ESCSEQ("iuml", "ï"),
-                        ESCSEQ("eth", " "),
-                        ESCSEQ("ntilde", "ñ"),
-                        ESCSEQ("ograve", "ò"),
-                        ESCSEQ("oacute", "ó"),
-                        ESCSEQ("ocirc", "ô"),
-                        ESCSEQ("otilde", "õ"),
-                        ESCSEQ("ouml", "ö"),
-                        ESCSEQ("divide", " "),
-                        ESCSEQ("oslash", " "),
-                        ESCSEQ("ugrave", "ù"),
-                        ESCSEQ("uacute", "ú"),
-                        ESCSEQ("ucirc", "û"),
-                        ESCSEQ("uuml", "ü"),
-
-                        ESCSEQ("yuml", ""),
-
-                        /* this one should ALWAYS stay the last one!!! */
-                        ESCSEQ("amp", "&"),
-
-                        { NULL, NULL, NULL }
-                        };
-
-                for (int i = 0; substitutions[i][0] != NULL; i++) 
-                {
-                    m_Name.Replace(substitutions[i][0], substitutions[i][2], TRUE);
-                    m_Name.Replace(substitutions[i][1], substitutions[i][2], TRUE);
-                }
-            }
-        }
-        if (tag.GetParam(wxT("NAME")) == wxT("Local")) m_Page = tag.GetParam(wxT("VALUE"));
-        if (tag.GetParam(wxT("NAME")) == wxT("ID")) tag.ScanParam(wxT("VALUE"), wxT("%i"), &m_ID);
+        if (tag.GetParam(wxT("NAME")) == wxT("Local"))
+            m_Page = tag.GetParam(wxT("VALUE"));
+        if (tag.GetParam(wxT("NAME")) == wxT("ID"))
+            tag.GetParamAsInt(wxT("VALUE"), &m_ID);

         return FALSE;
     }
 }
         return FALSE;
     }
 }


@@ -298,6 +193,16 @@ void HP_TagHandler::ReadIn(wxHtmlContentsItem* array, int size)
 // wxHtmlHelpData
 //-----------------------------------------------------------------------------
 
 // wxHtmlHelpData
 //-----------------------------------------------------------------------------
 

+wxString wxHtmlBookRecord::GetFullPath(const wxString &page) const
+{
+    if (wxIsAbsolutePath(page))
+        return page;
+    else
+        return m_BasePath + page;
+}
+
+
+

 IMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpData, wxObject)
 
 wxHtmlHelpData::wxHtmlHelpData()
 IMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpData, wxObject)
 
 wxHtmlHelpData::wxHtmlHelpData()


@@ -315,19 +220,19 @@ wxHtmlHelpData::~wxHtmlHelpData()
     int i;
 
     m_BookRecords.Empty();
     int i;
 
     m_BookRecords.Empty();

-    if (m_Contents) 
+    if (m_Contents)

     {
     {

-        for (i = 0; i < m_ContentsCnt; i++) 
-           {
+        for (i = 0; i < m_ContentsCnt; i++)
+        {

             delete[] m_Contents[i].m_Page;
             delete[] m_Contents[i].m_Name;
         }
         free(m_Contents);
     }
             delete[] m_Contents[i].m_Page;
             delete[] m_Contents[i].m_Name;
         }
         free(m_Contents);
     }

-    if (m_Index) 
+    if (m_Index)

     {
     {

-        for (i = 0; i < m_IndexCnt; i++) 
-           {
+        for (i = 0; i < m_IndexCnt; i++)
+        {

             delete[] m_Index[i].m_Page;
             delete[] m_Index[i].m_Name;
         }
             delete[] m_Index[i].m_Page;
             delete[] m_Index[i].m_Name;
         }


@@ -347,7 +252,7 @@ bool wxHtmlHelpData::LoadMSProject(wxHtmlBookRecord *book, wxFileSystem& fsys, c
     parser.AddTagHandler(handler);
 
     f = ( contentsfile.IsEmpty() ? (wxFSFile*) NULL : fsys.OpenFile(contentsfile) );
     parser.AddTagHandler(handler);
 
     f = ( contentsfile.IsEmpty() ? (wxFSFile*) NULL : fsys.OpenFile(contentsfile) );

-    if (f) 
+    if (f)

     {
         sz = f->GetStream()->GetSize();
         buf = new char[sz + 1];
     {
         sz = f->GetStream()->GetSize();
         buf = new char[sz + 1];


@@ -363,7 +268,7 @@ bool wxHtmlHelpData::LoadMSProject(wxHtmlBookRecord *book, wxFileSystem& fsys, c
         wxLogError(_("Cannot open contents file: %s"), contentsfile.c_str());
 
     f = ( indexfile.IsEmpty() ? (wxFSFile*) NULL : fsys.OpenFile(indexfile) );
         wxLogError(_("Cannot open contents file: %s"), contentsfile.c_str());
 
     f = ( indexfile.IsEmpty() ? (wxFSFile*) NULL : fsys.OpenFile(indexfile) );

-    if (f) 
+    if (f)

     {
         sz = f->GetStream()->GetSize();
         buf = new char[sz + 1];
     {
         sz = f->GetStream()->GetSize();
         buf = new char[sz + 1];


@@ -408,23 +313,23 @@ bool wxHtmlHelpData::LoadCachedBook(wxHtmlBookRecord *book, wxInputStream *f)
 
     f->Read(&x, sizeof(x));
     version = wxINT32_SWAP_ON_BE(x);
 
     f->Read(&x, sizeof(x));
     version = wxINT32_SWAP_ON_BE(x);

-    
-    if (version != CURRENT_CACHED_BOOK_VERSION) 
+
+    if (version != CURRENT_CACHED_BOOK_VERSION)

     {
         wxLogError(_("Incorrect version of HTML help book"));
         return FALSE;
         // NOTE: when adding new version, please ensure backward compatibility!
     }
     {
         wxLogError(_("Incorrect version of HTML help book"));
         return FALSE;
         // NOTE: when adding new version, please ensure backward compatibility!
     }

-    
+

     /* load contents : */
 
     f->Read(&x, sizeof(x));
     st = m_ContentsCnt;
     m_ContentsCnt += wxINT32_SWAP_ON_BE(x);
     /* load contents : */
 
     f->Read(&x, sizeof(x));
     st = m_ContentsCnt;
     m_ContentsCnt += wxINT32_SWAP_ON_BE(x);

-    m_Contents = (wxHtmlContentsItem*) realloc(m_Contents, 
-                                               (m_ContentsCnt / wxHTML_REALLOC_STEP + 1) * 
+    m_Contents = (wxHtmlContentsItem*) realloc(m_Contents,
+                                               (m_ContentsCnt / wxHTML_REALLOC_STEP + 1) *

                                                wxHTML_REALLOC_STEP * sizeof(wxHtmlContentsItem));
                                                wxHTML_REALLOC_STEP * sizeof(wxHtmlContentsItem));

-    for (i = st; i < m_ContentsCnt; i++) 
+    for (i = st; i < m_ContentsCnt; i++)

     {
         f->Read(&x, sizeof(x));
         m_Contents[i].m_Level = wxINT32_SWAP_ON_BE(x);
     {
         f->Read(&x, sizeof(x));
         m_Contents[i].m_Level = wxINT32_SWAP_ON_BE(x);


@@ -444,9 +349,9 @@ bool wxHtmlHelpData::LoadCachedBook(wxHtmlBookRecord *book, wxInputStream *f)
     f->Read(&x, sizeof(x));
     st = m_IndexCnt;
     m_IndexCnt += wxINT32_SWAP_ON_BE(x);
     f->Read(&x, sizeof(x));
     st = m_IndexCnt;
     m_IndexCnt += wxINT32_SWAP_ON_BE(x);

-    m_Index = (wxHtmlContentsItem*) realloc(m_Index, (m_IndexCnt / wxHTML_REALLOC_STEP + 1) * 
+    m_Index = (wxHtmlContentsItem*) realloc(m_Index, (m_IndexCnt / wxHTML_REALLOC_STEP + 1) *

                                                      wxHTML_REALLOC_STEP * sizeof(wxHtmlContentsItem));
                                                      wxHTML_REALLOC_STEP * sizeof(wxHtmlContentsItem));

-    for (i = st; i < m_IndexCnt; i++) 
+    for (i = st; i < m_IndexCnt; i++)

     {
         f->Read(&x, sizeof(x)); x = wxINT32_SWAP_ON_BE(x);
         m_Index[i].m_Name = new wxChar[x];
     {
         f->Read(&x, sizeof(x)); x = wxINT32_SWAP_ON_BE(x);
         m_Index[i].m_Name = new wxChar[x];


@@ -476,7 +381,7 @@ bool wxHtmlHelpData::SaveCachedBook(wxHtmlBookRecord *book, wxOutputStream *f)
     for (i = 0; i < m_ContentsCnt; i++) if (m_Contents[i].m_Book == book && m_Contents[i].m_Level > 0) x++;
     x = wxINT32_SWAP_ON_BE(x);
     f->Write(&x, sizeof(x));
     for (i = 0; i < m_ContentsCnt; i++) if (m_Contents[i].m_Book == book && m_Contents[i].m_Level > 0) x++;
     x = wxINT32_SWAP_ON_BE(x);
     f->Write(&x, sizeof(x));

-    for (i = 0; i < m_ContentsCnt; i++) 
+    for (i = 0; i < m_ContentsCnt; i++)

     {
         if (m_Contents[i].m_Book != book || m_Contents[i].m_Level == 0) continue;
         x = wxINT32_SWAP_ON_BE(m_Contents[i].m_Level);
     {
         if (m_Contents[i].m_Book != book || m_Contents[i].m_Level == 0) continue;
         x = wxINT32_SWAP_ON_BE(m_Contents[i].m_Level);


@@ -497,7 +402,7 @@ bool wxHtmlHelpData::SaveCachedBook(wxHtmlBookRecord *book, wxOutputStream *f)
     for (i = 0; i < m_IndexCnt; i++) if (m_Index[i].m_Book == book && m_Index[i].m_Level > 0) x++;
     x = wxINT32_SWAP_ON_BE(x);
     f->Write(&x, sizeof(x));
     for (i = 0; i < m_IndexCnt; i++) if (m_Index[i].m_Book == book && m_Index[i].m_Level > 0) x++;
     x = wxINT32_SWAP_ON_BE(x);
     f->Write(&x, sizeof(x));

-    for (i = 0; i < m_IndexCnt; i++) 
+    for (i = 0; i < m_IndexCnt; i++)

     {
         if (m_Index[i].m_Book != book || m_Index[i].m_Level == 0) continue;
         x = wxINT32_SWAP_ON_BE(wxStrlen(m_Index[i].m_Name) + 1);
     {
         if (m_Index[i].m_Book != book || m_Index[i].m_Level == 0) continue;
         x = wxINT32_SWAP_ON_BE(wxStrlen(m_Index[i].m_Name) + 1);


@@ -514,7 +419,7 @@ bool wxHtmlHelpData::SaveCachedBook(wxHtmlBookRecord *book, wxOutputStream *f)
 void wxHtmlHelpData::SetTempDir(const wxString& path)
 {
     if (path == wxEmptyString) m_TempPath = path;
 void wxHtmlHelpData::SetTempDir(const wxString& path)
 {
     if (path == wxEmptyString) m_TempPath = path;

-    else 
+    else

     {
         if (wxIsAbsolutePath(path)) m_TempPath = path;
         else m_TempPath = wxGetCwd() + _T("/") + path;
     {
         if (wxIsAbsolutePath(path)) m_TempPath = path;
         else m_TempPath = wxGetCwd() + _T("/") + path;


@@ -545,7 +450,7 @@ bool wxHtmlHelpData::AddBookParam(const wxFSFile& bookfile,
     wxFileSystem fsys;
     wxFSFile *fi;
     wxHtmlBookRecord *bookr;
     wxFileSystem fsys;
     wxFSFile *fi;
     wxHtmlBookRecord *bookr;

-    
+

     int IndexOld = m_IndexCnt,
         ContentsOld = m_ContentsCnt;
 
     int IndexOld = m_IndexCnt,
         ContentsOld = m_ContentsCnt;
 


@@ -571,35 +476,35 @@ bool wxHtmlHelpData::AddBookParam(const wxFSFile& bookfile,
     // 1. save file as book, but with .hhp.cached extension
     // 2. same as 1. but in temp path
     // 3. otherwise or if cache load failed, load it from MS.
     // 1. save file as book, but with .hhp.cached extension
     // 2. same as 1. but in temp path
     // 3. otherwise or if cache load failed, load it from MS.

-    
+

     fi = fsys.OpenFile(bookfile.GetLocation() + wxT(".cached"));
     fi = fsys.OpenFile(bookfile.GetLocation() + wxT(".cached"));

-    
-    if (fi == NULL || 
-          fi->GetModificationTime() < bookfile.GetModificationTime() || 
+
+    if (fi == NULL ||
+          fi->GetModificationTime() < bookfile.GetModificationTime() ||

           !LoadCachedBook(bookr, fi->GetStream()))
     {
         if (fi != NULL) delete fi;
         fi = fsys.OpenFile(m_TempPath + wxFileNameFromPath(bookfile.GetLocation()) + wxT(".cached"));
           !LoadCachedBook(bookr, fi->GetStream()))
     {
         if (fi != NULL) delete fi;
         fi = fsys.OpenFile(m_TempPath + wxFileNameFromPath(bookfile.GetLocation()) + wxT(".cached"));

-        if (m_TempPath == wxEmptyString || fi == NULL || 
-            fi->GetModificationTime() < bookfile.GetModificationTime() || 
+        if (m_TempPath == wxEmptyString || fi == NULL ||
+            fi->GetModificationTime() < bookfile.GetModificationTime() ||

             !LoadCachedBook(bookr, fi->GetStream()))
         {
             LoadMSProject(bookr, fsys, indexfile, contfile);
             !LoadCachedBook(bookr, fi->GetStream()))
         {
             LoadMSProject(bookr, fsys, indexfile, contfile);

-            if (m_TempPath != wxEmptyString) 
+            if (m_TempPath != wxEmptyString)

             {
             {

-                wxFileOutputStream *outs = new wxFileOutputStream(m_TempPath + 
+                wxFileOutputStream *outs = new wxFileOutputStream(m_TempPath +

                                                   SafeFileName(wxFileNameFromPath(bookfile.GetLocation())) + wxT(".cached"));
                 SaveCachedBook(bookr, outs);
                 delete outs;
             }
         }
     }
                                                   SafeFileName(wxFileNameFromPath(bookfile.GetLocation())) + wxT(".cached"));
                 SaveCachedBook(bookr, outs);
                 delete outs;
             }
         }
     }

-    
+

     if (fi != NULL) delete fi;
 
     // Now store the contents range
     bookr->SetContentsRange(cont_start, m_ContentsCnt);
     if (fi != NULL) delete fi;
 
     // Now store the contents range
     bookr->SetContentsRange(cont_start, m_ContentsCnt);

-    
+

     // Convert encoding, if neccessary:
     if (encoding != wxFONTENCODING_SYSTEM)
     {
     // Convert encoding, if neccessary:
     if (encoding != wxFONTENCODING_SYSTEM)
     {


@@ -609,7 +514,7 @@ bool wxHtmlHelpData::AddBookParam(const wxFSFile& bookfile,
             int i;
             wxEncodingConverter conv;
             conv.Init(encoding, a[0]);
             int i;
             wxEncodingConverter conv;
             conv.Init(encoding, a[0]);

-            
+

             for (i = IndexOld; i < m_IndexCnt; i++)
                 conv.Convert(m_Index[i].m_Name);
             for (i = ContentsOld; i < m_ContentsCnt; i++)
             for (i = IndexOld; i < m_IndexCnt; i++)
                 conv.Convert(m_Index[i].m_Name);
             for (i = ContentsOld; i < m_ContentsCnt; i++)


@@ -628,7 +533,7 @@ bool wxHtmlHelpData::AddBookParam(const wxFSFile& bookfile,
 bool wxHtmlHelpData::AddBook(const wxString& book)
 {
     if (book.Right(4).Lower() == wxT(".zip") ||
 bool wxHtmlHelpData::AddBook(const wxString& book)
 {
     if (book.Right(4).Lower() == wxT(".zip") ||

-        book.Right(4).Lower() == wxT(".htb") /*html book*/) 
+        book.Right(4).Lower() == wxT(".htb") /*html book*/)

 
     {
         wxFileSystem fsys;
 
     {
         wxFileSystem fsys;


@@ -636,18 +541,18 @@ bool wxHtmlHelpData::AddBook(const wxString& book)
         bool rt = FALSE;
 
         s = fsys.FindFirst(book + wxT("#zip:") + wxT("*.hhp"), wxFILE);
         bool rt = FALSE;
 
         s = fsys.FindFirst(book + wxT("#zip:") + wxT("*.hhp"), wxFILE);

-        while (!s.IsEmpty()) 
+        while (!s.IsEmpty())

         {
             if (AddBook(s)) rt = TRUE;
             s = fsys.FindNext();
         }
         {
             if (AddBook(s)) rt = TRUE;
             s = fsys.FindNext();
         }

-        
+

         return rt;
     }
 
 
         return rt;
     }
 
 

-    else 
-    {       
+    else
+    {

         wxFSFile *fi;
         wxFileSystem fsys;
         wxInputStream *s;
         wxFSFile *fi;
         wxFileSystem fsys;
         wxInputStream *s;


@@ -660,15 +565,22 @@ bool wxHtmlHelpData::AddBook(const wxString& book)
         wxString title = _("noname"),
                  safetitle,
                  start = wxEmptyString,
         wxString title = _("noname"),
                  safetitle,
                  start = wxEmptyString,

-                 contents = wxEmptyString, 
+                 contents = wxEmptyString,

                  index = wxEmptyString,
                  charset = wxEmptyString;
 
                  index = wxEmptyString,
                  charset = wxEmptyString;
 

+#if defined(__WXMAC__) && !defined(__DARWIN__)
+        if (wxIsAbsolutePath(book)) bookFull = book;
+        else bookFull = wxGetCwd() + book; // no slash or dot
+        wxFileName fn( bookFull );
+        bookFull = fn.GetFullPath( wxPATH_UNIX );
+#else

         if (wxIsAbsolutePath(book)) bookFull = book;
         else bookFull = wxGetCwd() + "/" + book;
         if (wxIsAbsolutePath(book)) bookFull = book;
         else bookFull = wxGetCwd() + "/" + book;

+#endif

 
         fi = fsys.OpenFile(bookFull);
 
         fi = fsys.OpenFile(bookFull);

-        if (fi == NULL) 
+        if (fi == NULL)

         {
             wxLogError(_("Cannot open HTML help book: %s"), bookFull.c_str());
             return FALSE;
         {
             wxLogError(_("Cannot open HTML help book: %s"), bookFull.c_str());
             return FALSE;


@@ -696,11 +608,11 @@ bool wxHtmlHelpData::AddBook(const wxString& book)
                 charset = linebuf + strlen("Charset=");
         } while (lineptr != NULL);
         delete[] buff;
                 charset = linebuf + strlen("Charset=");
         } while (lineptr != NULL);
         delete[] buff;

-    
+

         wxFontEncoding enc;
         if (charset == wxEmptyString) enc = wxFONTENCODING_SYSTEM;
         else enc = wxTheFontMapper->CharsetToEncoding(charset);
         wxFontEncoding enc;
         if (charset == wxEmptyString) enc = wxFONTENCODING_SYSTEM;
         else enc = wxTheFontMapper->CharsetToEncoding(charset);

-        bool rtval = AddBookParam(*fi, enc, 
+        bool rtval = AddBookParam(*fi, enc,

                                   title, contents, index, start, fsys.GetPath());
         delete fi;
         return rtval;
                                   title, contents, index, start, fsys.GetPath());
         delete fi;
         return rtval;


@@ -718,12 +630,12 @@ wxString wxHtmlHelpData::FindPageByName(const wxString& x)
     /* 1. try to open given file: */
 
     cnt = m_BookRecords.GetCount();
     /* 1. try to open given file: */
 
     cnt = m_BookRecords.GetCount();

-    for (i = 0; i < cnt; i++) 
+    for (i = 0; i < cnt; i++)

     {
     {

-        f = fsys.OpenFile(m_BookRecords[i].GetBasePath() + x);
-        if (f) 
-           {
-            url = m_BookRecords[i].GetBasePath() + x;
+        f = fsys.OpenFile(m_BookRecords[i].GetFullPath(x));
+        if (f)
+        {
+            url = m_BookRecords[i].GetFullPath(x);

             delete f;
             return url;
         }
             delete f;
             return url;
         }


@@ -732,11 +644,11 @@ wxString wxHtmlHelpData::FindPageByName(const wxString& x)
 
     /* 2. try to find a book: */
 
 
     /* 2. try to find a book: */
 

-    for (i = 0; i < cnt; i++) 
+    for (i = 0; i < cnt; i++)

     {
     {

-        if (m_BookRecords[i].GetTitle() == x) 
-           {
-            url = m_BookRecords[i].GetBasePath() + m_BookRecords[i].GetStart();
+        if (m_BookRecords[i].GetTitle() == x)
+        {
+            url = m_BookRecords[i].GetFullPath(m_BookRecords[i].GetStart());

             return url;
         }
     }
             return url;
         }
     }


@@ -744,11 +656,11 @@ wxString wxHtmlHelpData::FindPageByName(const wxString& x)
     /* 3. try to find in contents: */
 
     cnt = m_ContentsCnt;
     /* 3. try to find in contents: */
 
     cnt = m_ContentsCnt;

-    for (i = 0; i < cnt; i++) 
+    for (i = 0; i < cnt; i++)

     {
     {

-        if (wxStrcmp(m_Contents[i].m_Name, x) == 0) 
-           {
-            url = m_Contents[i].m_Book->GetBasePath() + m_Contents[i].m_Page;
+        if (wxStrcmp(m_Contents[i].m_Name, x) == 0)
+        {
+            url = m_Contents[i].GetFullPath();

             return url;
         }
     }
             return url;
         }
     }


@@ -757,11 +669,11 @@ wxString wxHtmlHelpData::FindPageByName(const wxString& x)
     /* 4. try to find in index: */
 
     cnt = m_IndexCnt;
     /* 4. try to find in index: */
 
     cnt = m_IndexCnt;

-    for (i = 0; i < cnt; i++) 
+    for (i = 0; i < cnt; i++)

     {
     {

-        if (wxStrcmp(m_Index[i].m_Name, x) == 0) 
-           {
-            url = m_Index[i].m_Book->GetBasePath() + m_Index[i].m_Page;
+        if (wxStrcmp(m_Index[i].m_Name, x) == 0)
+        {
+            url = m_Index[i].GetFullPath();

             return url;
         }
     }
             return url;
         }
     }


@@ -774,11 +686,11 @@ wxString wxHtmlHelpData::FindPageById(int id)
     int i;
     wxString url(wxEmptyString);
 
     int i;
     wxString url(wxEmptyString);
 

-    for (i = 0; i < m_ContentsCnt; i++) 
+    for (i = 0; i < m_ContentsCnt; i++)

     {
     {

-        if (m_Contents[i].m_ID == id) 
-           {
-            url = m_Contents[i].m_Book->GetBasePath() + m_Contents[i].m_Page;
+        if (m_Contents[i].m_ID == id)
+        {
+            url = m_Contents[i].GetFullPath();

             return url;
         }
     }
             return url;
         }
     }


@@ -797,13 +709,13 @@ wxHtmlSearchStatus::wxHtmlSearchStatus(wxHtmlHelpData* data, const wxString& key
     m_Data = data;
     m_Keyword = keyword;
     wxHtmlBookRecord* bookr = NULL;
     m_Data = data;
     m_Keyword = keyword;
     wxHtmlBookRecord* bookr = NULL;

-    if (book != wxEmptyString) 
+    if (book != wxEmptyString)

     {
         // we have to search in a specific book. Find it first
         int i, cnt = data->m_BookRecords.GetCount();
         for (i = 0; i < cnt; i++)
     {
         // we have to search in a specific book. Find it first
         int i, cnt = data->m_BookRecords.GetCount();
         for (i = 0; i < cnt; i++)

-            if (data->m_BookRecords[i].GetTitle() == book) 
-               {
+            if (data->m_BookRecords[i].GetTitle() == book)
+            {

                 bookr = &(data->m_BookRecords[i]);
                 m_CurIndex = bookr->GetContentsStart();
                 m_MaxIndex = bookr->GetContentsEnd();
                 bookr = &(data->m_BookRecords[i]);
                 m_CurIndex = bookr->GetContentsStart();
                 m_MaxIndex = bookr->GetContentsEnd();


@@ -812,7 +724,7 @@ wxHtmlSearchStatus::wxHtmlSearchStatus(wxHtmlHelpData* data, const wxString& key
         // check; we won't crash if the book doesn't exist, but it's Bad Anyway.
         wxASSERT(bookr);
     }
         // check; we won't crash if the book doesn't exist, but it's Bad Anyway.
         wxASSERT(bookr);
     }

-    if (! bookr) 
+    if (! bookr)

     {
         // no book specified; search all books
         m_CurIndex = 0;
     {
         // no book specified; search all books
         m_CurIndex = 0;


@@ -830,7 +742,7 @@ bool wxHtmlSearchStatus::Search()
     bool found = FALSE;
     wxChar *thepage;
 
     bool found = FALSE;
     wxChar *thepage;
 

-    if (!m_Active) 
+    if (!m_Active)

     {
         // sanity check. Illegal use, but we'll try to prevent a crash anyway
         wxASSERT(m_Active);
     {
         // sanity check. Illegal use, but we'll try to prevent a crash anyway
         wxASSERT(m_Active);


@@ -846,7 +758,7 @@ bool wxHtmlSearchStatus::Search()
     if (m_LastPage != NULL)
     {
         wxChar *p1, *p2;
     if (m_LastPage != NULL)
     {
         wxChar *p1, *p2;

-        for (p1 = thepage, p2 = m_LastPage; 
+        for (p1 = thepage, p2 = m_LastPage;

              *p1 != 0 && *p1 != _T('#') && *p1 == *p2; p1++, p2++) {}
 
         m_LastPage = thepage;
              *p1 != 0 && *p1 != _T('#') && *p1 == *p2; p1++, p2++) {}
 
         m_LastPage = thepage;


@@ -855,12 +767,13 @@ bool wxHtmlSearchStatus::Search()
             return FALSE;
     }
     else m_LastPage = thepage;
             return FALSE;
     }
     else m_LastPage = thepage;

-    
+

     wxFileSystem fsys;
     wxFileSystem fsys;

-    file = fsys.OpenFile(m_Data->m_Contents[i].m_Book->GetBasePath() + thepage);
-    if (file) 
+    file = fsys.OpenFile(m_Data->m_Contents[i].m_Book->GetFullPath(thepage));
+    if (file)

     {
     {

-        if (m_Engine.Scan(file->GetStream())) {
+        if (m_Engine.Scan(file->GetStream()))
+        {

             m_Name = m_Data->m_Contents[i].m_Name;
             m_ContentsItem = m_Data->m_Contents + i;
             found = TRUE;
             m_Name = m_Data->m_Contents[i].m_Name;
             m_ContentsItem = m_Data->m_Contents + i;
             found = TRUE;


@@ -888,15 +801,15 @@ void wxSearchEngine::LookFor(const wxString& keyword, bool case_sensitive, bool
     if (m_Keyword) delete[] m_Keyword;
     m_Keyword = new wxChar[keyword.Length() + 1];
     wxStrcpy(m_Keyword, keyword.c_str());
     if (m_Keyword) delete[] m_Keyword;
     m_Keyword = new wxChar[keyword.Length() + 1];
     wxStrcpy(m_Keyword, keyword.c_str());

-    
+

     if (!m_CaseSensitive)
     {
         for (int i = wxStrlen(m_Keyword) - 1; i >= 0; i--)
     if (!m_CaseSensitive)
     {
         for (int i = wxStrlen(m_Keyword) - 1; i >= 0; i--)

-           {
+        {

             if ((m_Keyword[i] >= wxT('A')) && (m_Keyword[i] <= wxT('Z')))
                 m_Keyword[i] += wxT('a') - wxT('A');
             if ((m_Keyword[i] >= wxT('A')) && (m_Keyword[i] <= wxT('Z')))
                 m_Keyword[i] += wxT('a') - wxT('A');

-               }
-       }
+        }
+    }

 }
 
 
 }
 
 


@@ -921,19 +834,19 @@ bool wxSearchEngine::Scan(wxInputStream *stream)
 
     if (m_WholeWords)
     {
 
     if (m_WholeWords)
     {

-        for (i = 0; i < lng - wrd; i++) 
-           {
+        for (i = 0; i < lng - wrd; i++)
+        {

             if (WHITESPACE(buf[i])) continue;
             j = 0;
             while ((j < wrd) && (buf[i + j] == m_Keyword[j])) j++;
             if (j == wrd && WHITESPACE(buf[i + j])) { found = TRUE; break; }
         }
     }
             if (WHITESPACE(buf[i])) continue;
             j = 0;
             while ((j < wrd) && (buf[i + j] == m_Keyword[j])) j++;
             if (j == wrd && WHITESPACE(buf[i + j])) { found = TRUE; break; }
         }
     }

-    
+

     else
     {
     else
     {

-        for (i = 0; i < lng - wrd; i++) 
-           {
+        for (i = 0; i < lng - wrd; i++)
+        {

             j = 0;
             while ((j < wrd) && (buf[i + j] == m_Keyword[j])) j++;
             if (j == wrd) { found = TRUE; break; }
             j = 0;
             while ((j < wrd) && (buf[i + j] == m_Keyword[j])) j++;
             if (j == wrd) { found = TRUE; break; }


@@ -946,5 +859,4 @@ bool wxSearchEngine::Scan(wxInputStream *stream)
 
 
 
 
 
 

-

 #endif
 #endif