sim: rx: mitigate fread warning

Current toolchains warn about unused result from fread, so mitigate
the edge case if fread returns short data.  It's not great, but it
gets things building again.

diff --git a/sim/rx/ChangeLog b/sim/rx/ChangeLog
index d548becfcd000c75f15203bf4deffbb7343f4fab..e78fe61dab5fea8c67a69cec56343ef0fef25bca 100644 (file)
--- a/sim/rx/ChangeLog
+++ b/sim/rx/ChangeLog
@@ -1,3 +1,8 @@
+2021-02-13  Mike Frysinger  <vapier@gentoo.org>
+
+       * trace.c (load_file_and_line): Use fread return value to index
+       the data.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
        * configure.ac: Replace sinclude with AC_CONFIG_MACRO_DIRS.

diff --git a/sim/rx/trace.c b/sim/rx/trace.c
index e5db49b5ca9895e494ac3a0da49c91ac7df80e48..caa51b794dfc915bafa074135a434c685fc31724 100644 (file)
--- a/sim/rx/trace.c
+++ b/sim/rx/trace.c
@@ -143,6 +143,7 @@ load_file_and_line (const char *filename, int lineno)
       FILE *file;
       int i;
       struct stat s;
+      size_t ret;
       const char *found_filename, *slash;
 
       found_filename = filename;
@@ -162,8 +163,8 @@ load_file_and_line (const char *filename, int lineno)
       f->filename = strdup (filename);
       f->data = (char *) malloc (s.st_size + 2);
       file = fopen (found_filename, "rb");
-      fread (f->data, 1, s.st_size, file);
-      f->data[s.st_size] = 0;
+      ret = fread (f->data, 1, s.st_size, file);
+      f->data[ret] = 0;
       fclose (file);
 
       f->nlines = 1;