trim line ending whitespace when reading ihex file

Polarisru · Feb 21, 2020 · 3dd4a83 · 3dd4a83
1 parent 3741ea7
commit 3dd4a83
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/ihex.c b/ihex.c
@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <ctype.h>
 #include <string.h>
 #include "ihex.h"
 
@@ -131,13 +132,18 @@ uint8_t IHEX_ReadFile(FILE *fp, uint8_t *data, uint16_t maxlen, uint16_t *max_ad
  uint8_t i;
  uint8_t byte;
  char str[128];
+ char *end;
 
  addr = 0;
  segment = 0;
  while (!feof(fp))
  {
  if (fgets(str, sizeof(str), fp) == NULL)
  return IHEX_ERROR_FILE;
+ // trim whitespace on the right
+ end = str + strlen(str) - 1;
+ while (end > str && isspace((unsigned char) *end)) end--;
+ end[1] = '\0';
  if (strlen(str) < IHEX_MIN_STRING)
  return IHEX_ERROR_FMT;
  len = IHEX_GetByte(&str[IHEX_OFFS_LEN]);

diff --git a/ihex.h b/ihex.h
@@ -6,7 +6,7 @@
 #include <stdbool.h>
 
 #define IHEX_LINE_LENGTH 16
-#define IHEX_MIN_STRING 12
+#define IHEX_MIN_STRING 11
 
 #define IHEX_OFFS_LEN 1
 #define IHEX_OFFS_ADDR 3