sys-file-reader: get_text_token did not set delimiter - bug #58943

[pspp] / src / libpspp / str.c

diff --git a/src/libpspp/str.c b/src/libpspp/str.c
index c227f7f6989da54c915b82884f6b6ee453a63ebf..a58473192e44c1f7dc3cc59c2ac7b3e0deed373a 100644 (file)
--- a/src/libpspp/str.c
+++ b/src/libpspp/str.c
@@ -511,7 +511,7 @@ ss_tokenize (struct substring ss, struct substring delimiters,
   ss_get_bytes (&ss, ss_cspan (ss, delimiters), token);
 
   found_token = ss_length (*token) > 0;
-  *save_idx += ss_length (*token) + found_token;
+  *save_idx += ss_length (*token) + (found_token?1:0);
   return found_token;
 }
 
@@ -738,7 +738,7 @@ ss_cspan (struct substring ss, struct substring stop_set)
 size_t
 ss_find_byte (struct substring ss, char c)
 {
-  const char *p = memchr (ss.string, c, ss.length);
+  const char *p = memchr (ss.string, (int) c, ss.length);
   return p != NULL ? p - ss.string : SIZE_MAX;
 }