AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

more std iostream + Unicode fixes; copy streams in blocks of 4Kb, not char by char

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19065 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2003-02-02 13:29:50 +00:00
parent 90e2cbf780
commit fb6e5b179a
1 changed files with 61 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
src/common/docview.cpp
View File

@ -2171,77 +2171,99 @@ void wxFileHistory::AddFilesToMenu(wxMenu* menu)
// ----------------------------------------------------------------------------
#if wxUSE_STD_IOSTREAM
bool wxTransferFileToStream(const wxString& filename, wxSTD ostream& stream)
{
FILE *fd1;
int ch;
if ((fd1 = wxFopen (filename.fn_str(), _T("rb"))) == NULL)
wxFFile file(filename, _T("rb"));
if ( !file.IsOpened() )
return FALSE;
while ((ch = getc (fd1)) != EOF)
stream << (unsigned char)ch;
char buf[4096];
size_t nRead;
do
{
nRead = file.Read(buf, WXSIZEOF(buf));
if ( file.Error() )
return FALSE;
stream.write(buf, nRead);
if ( !stream )
return FALSE;
}
while ( !file.Eof() );
fclose (fd1);
return TRUE;
}
bool wxTransferStreamToFile(wxSTD istream& stream, const wxString& filename)
{
FILE *fd1;
int ch;
if ((fd1 = wxFopen (filename.fn_str(), _T("wb"))) == NULL)
{
wxFFile file(filename, _T("wb"));
if ( !file.IsOpened() )
return FALSE;
}
while (!stream.eof())
char buf[4096];
do
{
ch = stream.get();
if (!stream.eof())
putc (ch, fd1);
stream.read(buf, WXSIZEOF(buf));
if ( !stream.bad() ) // fail may be set on EOF, don't use operator!()
{
if ( !file.Write(buf, stream.gcount()) )
return FALSE;
}
}
fclose (fd1);
while ( !stream.eof() );
return TRUE;
}
#else
#else // !wxUSE_STD_IOSTREAM
bool wxTransferFileToStream(const wxString& filename, wxOutputStream& stream)
{
FILE *fd1;
int ch;
if ((fd1 = wxFopen (filename, wxT("rb"))) == NULL)
wxFFile file(filename, _T("rb"));
if ( !file.IsOpened() )
return FALSE;
while ((ch = getc (fd1)) != EOF)
stream.PutC((char) ch);
char buf[4096];
size_t nRead;
do
{
nRead = file.Read(buf, WXSIZEOF(buf));
if ( file.Error() )
return FALSE;
stream.Write(buf, nRead);
if ( !stream )
return FALSE;
}
while ( !file.Eof() );
fclose (fd1);
return TRUE;
}
bool wxTransferStreamToFile(wxInputStream& stream, const wxString& filename)
{
FILE *fd1;
char ch;
if ((fd1 = wxFopen (filename, wxT("wb"))) == NULL)
{
wxFFile file(filename, _T("wb"));
if ( !file.IsOpened() )
return FALSE;
}
int len = stream.GetSize();
// TODO: is this the correct test for EOF?
while (stream.TellI() < (len - 1))
char buf[4096];
do
{
ch = stream.GetC();
putc (ch, fd1);
stream.Read(buf, WXSIZEOF(buf));
const size_t nRead = stream.LastRead();
if ( !nRead || !file.Write(buf, nRead) )
return FALSE;
}
fclose (fd1);
while ( !stream.Eof() );
return TRUE;
}
#endif
#endif // wxUSE_STD_IOSTREAM/!wxUSE_STD_IOSTREAM
#endif // wxUSE_DOC_VIEW_ARCHITECTURE