Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check for and allow zero length files

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21517 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-06-30 17:37:34 +00:00
parent 7142ac377a
commit 041973c55e
4 changed files with 80 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
contrib/src/stc/stc.cpp
View File

@@ -2093,17 +2093,22 @@ bool wxStyledTextCtrl::SaveFile(const wxString& filename)
bool wxStyledTextCtrl::LoadFile(const wxString& filename) bool wxStyledTextCtrl::LoadFile(const wxString& filename)
{ {
bool success = false;
wxFile file(filename, wxFile::read); wxFile file(filename, wxFile::read);
if (!file.IsOpened()) if (file.IsOpened())
return FALSE; {
wxString contents; wxString contents;
off_t len = file.Length(); off_t len = file.Length();
if (len > 0)
{
wxChar *buf = contents.GetWriteBuf(len); wxChar *buf = contents.GetWriteBuf(len);
bool success = (file.Read(buf, len) == len); success = (file.Read(buf, len) == len);
contents.UngetWriteBuf(); contents.UngetWriteBuf();
}
else
success = true; // empty file is ok
if (success) if (success)
{ {
@@ -2111,6 +2116,7 @@ bool wxStyledTextCtrl::LoadFile(const wxString& filename)
EmptyUndoBuffer(); EmptyUndoBuffer();
SetSavePoint(); SetSavePoint();
} }
}
return success; return success;
} }

14
contrib/src/stc/stc.cpp.in
View File

@@ -325,17 +325,22 @@ bool wxStyledTextCtrl::SaveFile(const wxString& filename)
bool wxStyledTextCtrl::LoadFile(const wxString& filename) bool wxStyledTextCtrl::LoadFile(const wxString& filename)
{ {
bool success = false;
wxFile file(filename, wxFile::read); wxFile file(filename, wxFile::read);
if (!file.IsOpened()) if (file.IsOpened())
return FALSE; {
wxString contents; wxString contents;
off_t len = file.Length(); off_t len = file.Length();
if (len > 0)
{
wxChar *buf = contents.GetWriteBuf(len); wxChar *buf = contents.GetWriteBuf(len);
bool success = (file.Read(buf, len) == len); success = (file.Read(buf, len) == len);
contents.UngetWriteBuf(); contents.UngetWriteBuf();
}
else
success = true; // empty file is ok
if (success) if (success)
{ {
@@ -343,6 +348,7 @@ bool wxStyledTextCtrl::LoadFile(const wxString& filename)
EmptyUndoBuffer(); EmptyUndoBuffer();
SetSavePoint(); SetSavePoint();
} }
}
return success; return success;
} }

14
src/stc/stc.cpp
View File

@@ -2093,17 +2093,22 @@ bool wxStyledTextCtrl::SaveFile(const wxString& filename)
bool wxStyledTextCtrl::LoadFile(const wxString& filename) bool wxStyledTextCtrl::LoadFile(const wxString& filename)
{ {
bool success = false;
wxFile file(filename, wxFile::read); wxFile file(filename, wxFile::read);
if (!file.IsOpened()) if (file.IsOpened())
return FALSE; {
wxString contents; wxString contents;
off_t len = file.Length(); off_t len = file.Length();
if (len > 0)
{
wxChar *buf = contents.GetWriteBuf(len); wxChar *buf = contents.GetWriteBuf(len);
bool success = (file.Read(buf, len) == len); success = (file.Read(buf, len) == len);
contents.UngetWriteBuf(); contents.UngetWriteBuf();
}
else
success = true; // empty file is ok
if (success) if (success)
{ {
@@ -2111,6 +2116,7 @@ bool wxStyledTextCtrl::LoadFile(const wxString& filename)
EmptyUndoBuffer(); EmptyUndoBuffer();
SetSavePoint(); SetSavePoint();
} }
}
return success; return success;
} }

14
src/stc/stc.cpp.in
View File

@@ -325,17 +325,22 @@ bool wxStyledTextCtrl::SaveFile(const wxString& filename)
bool wxStyledTextCtrl::LoadFile(const wxString& filename) bool wxStyledTextCtrl::LoadFile(const wxString& filename)
{ {
bool success = false;
wxFile file(filename, wxFile::read); wxFile file(filename, wxFile::read);
if (!file.IsOpened()) if (file.IsOpened())
return FALSE; {
wxString contents; wxString contents;
off_t len = file.Length(); off_t len = file.Length();
if (len > 0)
{
wxChar *buf = contents.GetWriteBuf(len); wxChar *buf = contents.GetWriteBuf(len);
bool success = (file.Read(buf, len) == len); success = (file.Read(buf, len) == len);
contents.UngetWriteBuf(); contents.UngetWriteBuf();
}
else
success = true; // empty file is ok
if (success) if (success)
{ {
@@ -343,6 +348,7 @@ bool wxStyledTextCtrl::LoadFile(const wxString& filename)
EmptyUndoBuffer(); EmptyUndoBuffer();
SetSavePoint(); SetSavePoint();
} }
}
return success; return success;
} }