Improved and defined more precisely textfile_sizes().

[plomrogue] / src / misc.c

diff --git a/src/misc.c b/src/misc.c
index 4db3bc319c906de93004606ffbda90955e0cdbd5..4b25f65f5c05b387d3bfc359e76018411c30676f 100644 (file)
--- a/src/misc.c
+++ b/src/misc.c
@@ -5,7 +5,7 @@
 #include <unistd.h> /* for unlink(), acess() */
 #include <stdlib.h> /* for calloc(), free() */
 #include <string.h> /* for strlen(), strcmp(), memcpy() */
-#include <stdint.h> /* for uint16_t */
+#include <stdint.h> /* for uint8_t, uint16_t */
 #include "readwrite.h" /* for [read/write]_uint[8/16/32][_bigendian]() */
 #include "map_objects.h" /* for struct Monster, write_map_objects(), */
 #include "map_object_actions.h" /* for is_passable(), move_monster() */
@@ -17,22 +17,26 @@
 
 
 
-extern void textfile_sizes(FILE * file, uint16_t * linemax_p,
-                           uint16_t * n_lines_p)
+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,12 +45,21 @@ extern void textfile_sizes(FILE * file, uint16_t * linemax_p,
             }
         }
     }
-    fseek(file, 0, SEEK_SET);
+    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;
+    }
     * linemax_p = linemax;
     if (n_lines_p)
     {
         * n_lines_p = n_lines;
     }
+    return 0;
 }