X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D?a=blobdiff_plain;f=src%2Fmisc.c;h=4b25f65f5c05b387d3bfc359e76018411c30676f;hb=0568c1c0f6735509f2a1afea31ecb5dc28f26bf4;hp=496c58549461370c8e100f28d60737f5edbd9770;hpb=2f0b15e05b0df7e10a2d0bb04ce4648455d980a8;p=plomrogue diff --git a/src/misc.c b/src/misc.c index 496c585..4b25f65 100644 --- a/src/misc.c +++ b/src/misc.c @@ -20,19 +20,23 @@ extern uint8_t textfile_sizes(FILE * file, uint16_t * linemax_p, uint16_t * n_lines_p) { - uint16_t n_lines = 0; int c = 0; - uint16_t linemax = 0; uint16_t c_count = 0; - while (EOF != c) + uint16_t n_lines = 0; + uint16_t linemax = 0; + while (1) { - c_count++; c = getc(file); + if (EOF == c) + { + break; + } + c_count++; if ('\n' == c) { if (c_count > linemax) { - linemax = c_count + 1; + linemax = c_count; } c_count = 0; if (n_lines_p) @@ -41,6 +45,11 @@ extern uint8_t textfile_sizes(FILE * file, uint16_t * linemax_p, } } } + if (0 == linemax && 0 < c_count) /* Handle files that consist of only one */ + { /* line / lack newline chars. */ + linemax = c_count; + } + if (-1 == fseek(file, 0, SEEK_SET)) { return 1;