X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fcommon%2Freadwrite.c;h=045bc4fbbc89f80ff2044bc971e98251488d1681;hb=2690e30a5d476cdf8689af9203748e7ed0fa841d;hp=3dcd2a2d90ec307d86a6c23fe99a36048725e143;hpb=1008f26c7c6855f59222bcbe2cd1505ba8a6f28f;p=plomrogue
diff --git a/src/common/readwrite.c b/src/common/readwrite.c
index 3dcd2a2..045bc4f 100644
--- a/src/common/readwrite.c
+++ b/src/common/readwrite.c
@@ -4,7 +4,7 @@
#include /* size_t */
#include /* uint8_t, uint16_t, uint32_t, UINT32_MAX */
#include /* FILE, fseek(), sprintf(), fgets(), fgetc(), ferror(),
- * fputc(), fwrite(), fclose(), fopen()
+ * fputc(), fwrite(), fclose(), fopen(), clearerr()
*/
#include /* strlen() */
#include /* for access(), unlink() */
@@ -53,6 +53,7 @@ extern void try_fputc(uint8_t c, FILE * file, char * f)
extern int try_fgetc(FILE * file, char * f)
{
+ clearerr(file); /* OSX' (BSD?) fgetc() needs this to undo previous EOFs. */
int test = fgetc(file);
exit_trouble(EOF == test && ferror(file), f, "fgetc()");
return test;
@@ -108,8 +109,8 @@ extern uint32_t textfile_width(FILE * file)
{
break;
}
- exit_trouble(UINT32_MAX == c_count, f_name, "too large text file line");
c_count++;
+ exit_trouble(UINT32_MAX == c_count, f_name, "too large text file line");
if ('\n' == c)
{
if (c_count > linemax)