Make textfile_width() check for too large lines.

[plomrogue] / src / common / readwrite.c

diff --git a/src/common/readwrite.c b/src/common/readwrite.c
index 026c9add7aba8e5434f158bb97c765d957d88d55..3dcd2a2d90ec307d86a6c23fe99a36048725e143 100644 (file)
--- a/src/common/readwrite.c
+++ b/src/common/readwrite.c
@@ -2,7 +2,7 @@
 
 #include "readwrite.h"
 #include <stddef.h> /* size_t */
-#include <stdint.h> /* uint8_t, uint16_t, uint32_t */
+#include <stdint.h> /* uint8_t, uint16_t, uint32_t, UINT32_MAX */
 #include <stdio.h> /* FILE, fseek(), sprintf(), fgets(), fgetc(), ferror(),
                     * fputc(), fwrite(), fclose(), fopen()
                     */
@@ -95,12 +95,11 @@ extern void try_fclose_unlink_rename(FILE * file, char * p1, char * p2,
 
 
 
-extern uint32_t textfile_sizes(FILE * file, uint32_t * n_lines_p)
+extern uint32_t textfile_width(FILE * file)
 {
-    char * f_name = "textfile_sizes()";
+    char * f_name = "textfile_width()";
     int c = 0;
     uint32_t c_count = 0;
-    uint32_t n_lines = 0;
     uint32_t linemax = 0;
     while (1)
     {
@@ -109,6 +108,7 @@ extern uint32_t textfile_sizes(FILE * file, uint32_t * n_lines_p)
         {
             break;
         }
+        exit_trouble(UINT32_MAX == c_count, f_name, "too large text file line");
         c_count++;
         if ('\n' == c)
         {
@@ -117,10 +117,6 @@ extern uint32_t textfile_sizes(FILE * file, uint32_t * n_lines_p)
                 linemax = c_count;
             }
             c_count = 0;
-            if (n_lines_p)
-            {
-                n_lines++;
-            }
         }
     }
   if (0 == linemax && 0 < c_count) /* Handle files that consist of only one */
@@ -128,9 +124,5 @@ extern uint32_t textfile_sizes(FILE * file, uint32_t * n_lines_p)
       linemax = c_count;
    }
    exit_trouble(-1 == fseek(file, 0, SEEK_SET), f_name, "fseek()");
-   if (n_lines_p)
-   {
-       * n_lines_p = n_lines;
-   }
    return linemax;
 }