Insurance against flaky drivers.

Don't rely on gpsdata.satellites to be counting only nonzero PRNs.

1 files changed, 5 insertions, 2 deletions

diff --git a/gpsd.c b/gpsd.c
index 71d5befb..c8217533 100644
--- a/gpsd.c
+++ b/gpsd.c
@@ -1062,9 +1062,13 @@ static int handle_gpsd_request(struct subscriber_t* sub, char *buf, int buflen)
 				   sub->device->gpsdata.sentence_time);
 		else
 		    (void)strlcat(phrase, " ? ", BUFSIZ);
+		/* insurance against flaky drivers */
+		for (i = 0; i < sub->device->gpsdata.satellites; i++)
+		    if (sub->device->gpsdata.PRN[i])
+			reported++;
 		(void)snprintf(phrase+strlen(phrase), 
 			       sizeof(phrase)-strlen(phrase),
-			       "%d:", sub->device->gpsdata.satellites);
+			       "%d:", reported);
 		for (i = 0; i < sub->device->gpsdata.satellites; i++) {
 		    used = 0;
 		    for (j = 0; j < sub->device->gpsdata.satellites_used; j++)
@@ -1080,7 +1084,6 @@ static int handle_gpsd_request(struct subscriber_t* sub, char *buf, int buflen)
 				      sub->device->gpsdata.elevation[i],sub->device->gpsdata.azimuth[i],
 				      sub->device->gpsdata.ss[i],
 				      used);
-			reported++;
 		    }
 		}
 		if (sub->device->gpsdata.satellites != reported)