X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=test_src%2Fserial-tools.c;h=4508ba6e9349231cb3b263908fb3fa7fe5b8e8f2;hp=47b64396985d5c448c3427bed1c38eb82c780d3c;hb=6bd58d7909b89a3e05003a63cdc642638fa653e6;hpb=36101d05fdd3f660375301ca9f017d2e16c228b7 diff --git a/test_src/serial-tools.c b/test_src/serial-tools.c index 47b6439..4508ba6 100644 --- a/test_src/serial-tools.c +++ b/test_src/serial-tools.c @@ -30,13 +30,15 @@ #include #include -int getnextwordn(char *s, int n){ /* words are seperated by spaces */ +int getnextwordn(char *s, int n){ /* words are seperated by spaces, lf or cr */ char c = ' '; - while ((c=uart_getc()) == ' ') - ; + do{ + c=uart_getc(); + }while(c==' ' || c=='\r' || c=='\n'); *s++ = c; - while (n && (*s++=uart_getc())!=' ') - ; + do{ + *s++ = c = uart_getc(); + }while(c!=' ' && c!='\r' && c!='\n' && --n); *(s-1) = '\0'; return n; }