[pkg-fso-commits] [SCM] mumpot branch, debian, updated. upstream/0.3.2-11-g24243a5

[Joachim Breitner]

The following commit has been merged in the debian branch:
commit 76c34ab38db39561b057222e889a0443018ed38f
Author: Andreas Kemnade <andreas at kemnade.info>
Date:   Mon Dec 1 22:42:41 2008 +0100

    NMEA compatibilitiy with fso-gpsd

diff --git a/src/gps.c b/src/gps.c
index b7229ca..5e85fd1 100644
--- a/src/gps.c
+++ b/src/gps.c
@@ -251,7 +251,7 @@ static void proc_gps_nmea(struct gpsfile *gpsf,
     if (strncmp(gpsf->buf,"$GPRMC",6)==0) {
       char *fields[13];
       int numfields=my_split(gpsf->buf,fields,",",13);
-      if ((numfields == 13)&&(strlen(fields[3])>3)) {
+      if (((numfields == 13)||(numfields == 12))&&(strlen(fields[3])>3)) {
         gpsf->curpoint.lattsec=to_seconds(fields[3]);
         gpsf->curpoint.longsec=to_seconds(fields[5]);
         if ((fields[4])[0] == 'S')
@@ -262,7 +262,7 @@ static void proc_gps_nmea(struct gpsfile *gpsf,
         gpsf->curpoint.date=fields[9];
         gpsf->curpoint.speed=atof(fields[7]);
         gpsf->curpoint.heading=atof(fields[8]);
-        gpsf->curpoint.state=(fields[12])[0];
+        gpsf->curpoint.state=(numfields==13)?((fields[12])[0]):'?';
 	gpsf->curpoint.start_new=gpsf->first?1:0;
         gpsproc(&gpsf->curpoint,data);
 	gpsf->first=0;

-- 
mumpot