s_mp_get_token stops at the right time now

Author: czurnieden

demo/mtest_opponent.c

@@ -20,6 +20,7 @@ static char *s_mp_get_token(char *s, int size, FILE *stream)
 {
    char *s_bar = s;
    int c;
+   bool eol_hit = false;
 
    /* "fgets [...] reads in at most one less than size characters from stream"  */
    while (--size)  {
@@ -32,9 +33,16 @@ static char *s_mp_get_token(char *s, int size, FILE *stream)
          break;
       }
       /* Ignore line-breaks but keep reading to get them out of the stream-buffer */
-      if ((c == '\n')  || (c == '\r')) {
+      if ((c == '\n') || (c == '\r')) {
+         eol_hit = true;
          continue;
       }
+      /* Stop reading after linebreak */
+      if (eol_hit) {
+         /* We already read the character after the linebreak, put it back */
+         ungetc(c, stream);
+         break;
+      }
       *s_bar++ = c;
    }
    /* "A terminating null byte ('\0') is stored after the last character in the buffer" */
@@ -108,7 +116,6 @@ static int mtest_opponent(void)
              add_n, sub_n, mul_n, div_n, sqr_n, mul2d_n, div2d_n, gcd_n, lcm_n,
              expt_n, inv_n, div2_n, mul2_n, add_d_n, sub_d_n);
       GET_TOKEN(cmd, 4095, stdin);
-      cmd[strlen(cmd) - 1u] = '\0';
       printf("%-6s ]\r", cmd);
       fflush(stdout);
       if (strcmp(cmd, "mul2d") == 0) {