From: Petr Štetiar <ynezz@true.cz>
Date: Wed, 27 Jul 2016 12:45:51 +0000 (+0200)
Subject: Use strsep for NMEA message tokenization
X-Git-Url: http://git.openwrt.org/?p=project%2Fugps.git;a=commitdiff_plain;h=882b239a2768e70143ace43205ead6cb56388042

Use strsep for NMEA message tokenization

strtok doesn't parse correctly following message:

  $GPGSA,A,1,,,,,,,,,,,,,,,*1E

Resulting in "datagram has wrong parameter count".

Signed-off-by: Petr Štetiar <ynezz@true.cz>
---

diff --git a/nmea.c b/nmea.c
index 05c904d..3646a36 100644
--- a/nmea.c
+++ b/nmea.c
@@ -221,13 +221,13 @@ static int
 nmea_tokenize(char *msg)
 {
 	int cnt = 0;
-	char *tok = strtok(msg, ",");
+	char *tok = strsep(&msg, ",");
 
 	while (tok && cnt < MAX_NMEA_PARAM) {
 		nmea_params[cnt].str = tok;
 		nmea_params[cnt].num = atoi(tok);
 		cnt++;
-		tok = strtok(NULL, ",");
+		tok = strsep(&msg, ",");
 	}
 
 	return cnt;