Author: AlbrechtS
Date: 2010-12-08 06:47:11 -0800 (Wed, 08 Dec 2010)
New Revision: 7979
Log:
Fixed Windows text file line endings, as discussed in STR 2348 and
fltk.development. Side effect: All Windows text files written are
in Windows, aka DOS format (with CR/LF line endings), no matter what
format they had when read. This is compatible with FLTK 1.1.
Modified:
branches/branch-1.3/src/Fl_Text_Buffer.cxx
Modified: branches/branch-1.3/src/Fl_Text_Buffer.cxx
===================================================================
--- branches/branch-1.3/src/Fl_Text_Buffer.cxx 2010-12-08 14:00:35 UTC (rev
7978)
+++ branches/branch-1.3/src/Fl_Text_Buffer.cxx 2010-12-08 14:47:11 UTC (rev
7979)
@@ -1518,8 +1518,7 @@
Insert text from a file.
Unicode safe. Input must be correct UTF-8!
*/
-int Fl_Text_Buffer::insertfile(const char *file, int pos, int /*buflen*/)
-{
+int Fl_Text_Buffer::insertfile(const char *file, int pos, int /*buflen*/) {
FILE *fp;
if (!(fp = fl_fopen(file, "r")))
return 1;
@@ -1528,8 +1527,11 @@
fseek(fp, 0, SEEK_SET);
if (!filesize) return 0;
char *buffer = new char[filesize+1];
- if (fread(buffer, 1, filesize, fp)==filesize) {
- buffer[filesize] = (char) 0;
+ // Note: If we read Windows text files in text mode, then Windows
+ // strips the <CR>'s from the text. Hence, rsize < filesize !
+ size_t rsize = fread(buffer, 1, filesize, fp);
+ if (rsize > 0) {
+ buffer[rsize] = (char) 0;
insert(pos, buffer);
}
int e = ferror(fp) ? 2 : 0;
@@ -1543,11 +1545,11 @@
Write text to file.
Unicode safe.
*/
-int Fl_Text_Buffer::outputfile(const char *file, int start, int end,
- int buflen)
-{
+int Fl_Text_Buffer::outputfile(const char *file,
+ int start, int end,
+ int buflen) {
FILE *fp;
- if (!(fp = fl_fopen(file, "wb")))
+ if (!(fp = fl_fopen(file, "w")))
return 1;
for (int n; (n = min(end - start, buflen)); start += n) {
const char *p = text_range(start, start + n);
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
