X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4f9297b0eead20a0bfee71df18e0d8f0cbc402fb..b9f933ab5d4a293790d0f5186c434229678c76ea:/src/html/htmlfilt.cpp?ds=inline diff --git a/src/html/htmlfilt.cpp b/src/html/htmlfilt.cpp index 6f30086b60..0482dc49cd 100644 --- a/src/html/htmlfilt.cpp +++ b/src/html/htmlfilt.cpp @@ -9,7 +9,7 @@ #ifdef __GNUG__ -#pragma implementation +#pragma implementation "htmlfilt.h" #endif #include "wx/wxprec.h" @@ -22,12 +22,42 @@ #endif #ifndef WXPRECOMP -#include "wx/wx.h" + #include "wx/log.h" + #include "wx/intl.h" #endif #include "wx/html/htmlfilt.h" #include "wx/html/htmlwin.h" +// utility function: read a wxString from a wxInputStream +void wxPrivate_ReadString(wxString& str, wxInputStream* s) +{ + size_t streamSize = s->GetSize(); + + if(streamSize == ~(size_t)0) + { + const size_t bufSize = 4095; + char buffer[bufSize+1]; + size_t lastRead; + + do + { + s->Read(buffer, bufSize); + lastRead = s->LastRead(); + buffer[lastRead] = 0; + str.Append(buffer); + } + while(lastRead == bufSize); + } + else + { + char* src = new char[streamSize+1]; + s->Read(src, streamSize); + src[streamSize] = 0; + str = src; + delete [] src; + } +} /* @@ -54,16 +84,12 @@ bool wxHtmlFilterPlainText::CanRead(const wxFSFile& WXUNUSED(file)) const wxString wxHtmlFilterPlainText::ReadFile(const wxFSFile& file) const { wxInputStream *s = file.GetStream(); - char *src; wxString doc, doc2; if (s == NULL) return wxEmptyString; - src = new char[s->GetSize()+1]; - src[s->GetSize()] = 0; - s->Read(src, s->GetSize()); - doc = src; - delete [] src; + wxPrivate_ReadString(doc, s); + doc.Replace(wxT("&"), wxT("&"), TRUE); doc.Replace(wxT("<"), wxT("<"), TRUE); doc.Replace(wxT(">"), wxT(">"), TRUE); doc2 = "
\n" + doc + "\n"; @@ -138,26 +164,21 @@ bool wxHtmlFilterHTML::CanRead(const wxFSFile& file) const wxString wxHtmlFilterHTML::ReadFile(const wxFSFile& file) const { wxInputStream *s = file.GetStream(); - char *src; wxString doc; - if (s == NULL) + if (s == NULL) { wxLogError(_("Cannot open HTML document: %s"), file.GetLocation().c_str()); return wxEmptyString; } - src = new char[s->GetSize() + 1]; - src[s->GetSize()] = 0; - s->Read(src, s->GetSize()); - doc = src; - delete[] src; + wxPrivate_ReadString(doc, s); - // add meta tag if we obtained this through http: + // add meta tag if we obtained this through http: if (file.GetMimeType().Find(_T("; charset=")) == 0) { wxString s(_T(""); - return s; + return s+doc; } return doc;