head 1.6; access; symbols pkgsrc-2026Q1:1.6.0.108 pkgsrc-2026Q1-base:1.6 pkgsrc-2025Q4:1.6.0.106 pkgsrc-2025Q4-base:1.6 pkgsrc-2025Q3:1.6.0.104 pkgsrc-2025Q3-base:1.6 pkgsrc-2025Q2:1.6.0.102 pkgsrc-2025Q2-base:1.6 pkgsrc-2025Q1:1.6.0.100 pkgsrc-2025Q1-base:1.6 pkgsrc-2024Q4:1.6.0.98 pkgsrc-2024Q4-base:1.6 pkgsrc-2024Q3:1.6.0.96 pkgsrc-2024Q3-base:1.6 pkgsrc-2024Q2:1.6.0.94 pkgsrc-2024Q2-base:1.6 pkgsrc-2024Q1:1.6.0.92 pkgsrc-2024Q1-base:1.6 pkgsrc-2023Q4:1.6.0.90 pkgsrc-2023Q4-base:1.6 pkgsrc-2023Q3:1.6.0.88 pkgsrc-2023Q3-base:1.6 pkgsrc-2023Q2:1.6.0.86 pkgsrc-2023Q2-base:1.6 pkgsrc-2023Q1:1.6.0.84 pkgsrc-2023Q1-base:1.6 pkgsrc-2022Q4:1.6.0.82 pkgsrc-2022Q4-base:1.6 pkgsrc-2022Q3:1.6.0.80 pkgsrc-2022Q3-base:1.6 pkgsrc-2022Q2:1.6.0.78 pkgsrc-2022Q2-base:1.6 pkgsrc-2022Q1:1.6.0.76 pkgsrc-2022Q1-base:1.6 pkgsrc-2021Q4:1.6.0.74 pkgsrc-2021Q4-base:1.6 pkgsrc-2021Q3:1.6.0.72 pkgsrc-2021Q3-base:1.6 pkgsrc-2021Q2:1.6.0.70 pkgsrc-2021Q2-base:1.6 pkgsrc-2021Q1:1.6.0.68 pkgsrc-2021Q1-base:1.6 pkgsrc-2020Q4:1.6.0.66 pkgsrc-2020Q4-base:1.6 pkgsrc-2020Q3:1.6.0.64 pkgsrc-2020Q3-base:1.6 pkgsrc-2020Q2:1.6.0.60 pkgsrc-2020Q2-base:1.6 pkgsrc-2020Q1:1.6.0.40 pkgsrc-2020Q1-base:1.6 pkgsrc-2019Q4:1.6.0.62 pkgsrc-2019Q4-base:1.6 pkgsrc-2019Q3:1.6.0.58 pkgsrc-2019Q3-base:1.6 pkgsrc-2019Q2:1.6.0.56 pkgsrc-2019Q2-base:1.6 pkgsrc-2019Q1:1.6.0.54 pkgsrc-2019Q1-base:1.6 pkgsrc-2018Q4:1.6.0.52 pkgsrc-2018Q4-base:1.6 pkgsrc-2018Q3:1.6.0.50 pkgsrc-2018Q3-base:1.6 pkgsrc-2018Q2:1.6.0.48 pkgsrc-2018Q2-base:1.6 pkgsrc-2018Q1:1.6.0.46 pkgsrc-2018Q1-base:1.6 pkgsrc-2017Q4:1.6.0.44 pkgsrc-2017Q4-base:1.6 pkgsrc-2017Q3:1.6.0.42 pkgsrc-2017Q3-base:1.6 pkgsrc-2017Q2:1.6.0.38 pkgsrc-2017Q2-base:1.6 pkgsrc-2017Q1:1.6.0.36 pkgsrc-2017Q1-base:1.6 pkgsrc-2016Q4:1.6.0.34 pkgsrc-2016Q4-base:1.6 pkgsrc-2016Q3:1.6.0.32 pkgsrc-2016Q3-base:1.6 pkgsrc-2016Q2:1.6.0.30 pkgsrc-2016Q2-base:1.6 pkgsrc-2016Q1:1.6.0.28 pkgsrc-2016Q1-base:1.6 pkgsrc-2015Q4:1.6.0.26 pkgsrc-2015Q4-base:1.6 pkgsrc-2015Q3:1.6.0.24 pkgsrc-2015Q3-base:1.6 pkgsrc-2015Q2:1.6.0.22 pkgsrc-2015Q2-base:1.6 pkgsrc-2015Q1:1.6.0.20 pkgsrc-2015Q1-base:1.6 pkgsrc-2014Q4:1.6.0.18 pkgsrc-2014Q4-base:1.6 pkgsrc-2014Q3:1.6.0.16 pkgsrc-2014Q3-base:1.6 pkgsrc-2014Q2:1.6.0.14 pkgsrc-2014Q2-base:1.6 pkgsrc-2014Q1:1.6.0.12 pkgsrc-2014Q1-base:1.6 pkgsrc-2013Q4:1.6.0.10 pkgsrc-2013Q4-base:1.6 pkgsrc-2013Q3:1.6.0.8 pkgsrc-2013Q3-base:1.6 pkgsrc-2013Q2:1.6.0.6 pkgsrc-2013Q2-base:1.6 pkgsrc-2013Q1:1.6.0.4 pkgsrc-2013Q1-base:1.6 pkgsrc-2012Q4:1.6.0.2 pkgsrc-2012Q4-base:1.6 pkgsrc-2012Q3:1.5.0.26 pkgsrc-2012Q3-base:1.5 pkgsrc-2012Q2:1.5.0.24 pkgsrc-2012Q2-base:1.5 pkgsrc-2012Q1:1.5.0.22 pkgsrc-2012Q1-base:1.5 pkgsrc-2011Q4:1.5.0.20 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q3:1.5.0.18 pkgsrc-2011Q3-base:1.5 pkgsrc-2011Q2:1.5.0.16 pkgsrc-2011Q2-base:1.5 pkgsrc-2011Q1:1.5.0.14 pkgsrc-2011Q1-base:1.5 pkgsrc-2010Q4:1.5.0.12 pkgsrc-2010Q4-base:1.5 pkgsrc-2010Q3:1.5.0.10 pkgsrc-2010Q3-base:1.5 pkgsrc-2010Q2:1.5.0.8 pkgsrc-2010Q2-base:1.5 pkgsrc-2010Q1:1.5.0.6 pkgsrc-2010Q1-base:1.5 pkgsrc-2009Q4:1.5.0.4 pkgsrc-2009Q4-base:1.5 pkgsrc-2009Q3:1.5.0.2 pkgsrc-2009Q3-base:1.5 pkgsrc-2008Q4:1.4.0.22 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.20 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.18 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.16 pkgsrc-2008Q2-base:1.4 pkgsrc-2008Q1:1.4.0.14 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.12 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.10 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.8 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.6 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.4 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.2 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.1.0.14 pkgsrc-2006Q2-base:1.1 pkgsrc-2006Q1:1.1.0.12 pkgsrc-2006Q1-base:1.1 pkgsrc-2005Q4:1.1.0.10 pkgsrc-2005Q4-base:1.1 pkgsrc-2005Q3:1.1.0.8 pkgsrc-2005Q3-base:1.1 pkgsrc-2005Q2:1.1.0.6 pkgsrc-2005Q2-base:1.1 pkgsrc-2005Q1:1.1.0.4 pkgsrc-2005Q1-base:1.1 pkgsrc-2004Q4:1.1.0.2 pkgsrc-2004Q4-base:1.1; locks; strict; comment @# @; 1.6 date 2012.12.24.21.08.43; author joerg; state Exp; branches; next 1.5; 1.5 date 2009.08.01.05.26.24; author hasso; state Exp; branches; next 1.4; 1.4 date 2006.07.19.16.07.30; author gson; state dead; branches; next 1.3; 1.3 date 2006.07.11.18.11.24; author gson; state Exp; branches; next 1.2; 1.2 date 2006.07.11.17.33.27; author gson; state Exp; branches; next 1.1; 1.1 date 2004.12.08.16.28.50; author gson; state Exp; branches; next ; desc @@ 1.6 log @Don't use non-literal strings as format strings. @ text @$NetBSD: patch-ab,v 1.5 2009/08/01 05:26:24 hasso Exp $ --- lib/gps1.c.orig 2006-07-14 02:35:53.000000000 +0000 +++ lib/gps1.c @@@@ -23,6 +23,7 @@@@ /* * Define the various serial I/O types */ +#undef BSD #define BSD 0 #define Linux 1 @@@@ -207,7 +208,7 @@@@ gps_read(gps_handle gps, u_char * val, i switch (stat) { case -1: if (gps_state.debug) - warn(gps_state.name); + warn("%s", gps_state.name); return -1; case 0: return 0; @@@@ -218,7 +219,7 @@@@ gps_read(gps_handle gps, u_char * val, i GPS_BUF_LEN); if (gps_state.bufcnt <= 0) { if (gps_state.debug) - warn(gps_state.name); + warn("%s", gps_state.name); return -1; } if (gps_state.debug > 4) { @@@@ -254,7 +255,7 @@@@ gps_write(gps_handle gps, const u_char * buf += written; } else { if (gps_state.debug) - warn(gps_state.name); + warn("%s", gps_state.name); return -1; } } @ 1.5 log @Make it build on DragonFly and probably some others. @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- lib/gps1.c.orig 2009-07-30 23:13:40 +0300 +++ lib/gps1.c 2009-07-30 23:14:17 +0300 d13 27 @ 1.4 log @Update garmin-utils to 2.4. The only changes relative to 2.2 are that all the pkgsrc patches have been integrated into the base distribution; there are no functional changes. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.3 2006/07/11 18:11:24 gson Exp $ d3 5 a7 19 --- lib/gpsformat.c.orig 2004-08-19 05:45:29.000000000 +0300 +++ lib/gpsformat.c @@@@ -34,11 +34,11 @@@@ scan_state(u_char *buf) { int state = START; if (*buf == '[') { - if (strncmp(buf, RTE_HDR, sizeof RTE_HDR - 1) == 0) + if (strncmp((char *) buf, RTE_HDR, sizeof RTE_HDR - 1) == 0) state = ROUTES; - else if (strncmp(buf, TRK_HDR, sizeof TRK_HDR - 1) == 0) + else if (strncmp((char *) buf, TRK_HDR, sizeof TRK_HDR - 1) == 0) state = TRACKS; - else if (strncmp(buf, WPT_HDR, sizeof WPT_HDR - 1) == 0) + else if (strncmp((char *) buf, WPT_HDR, sizeof WPT_HDR - 1) == 0) state = WAYPOINTS; } return state; @@@@ -58,7 +58,7 @@@@ gps_buffer_new(void) * convert len bytes of buf in hex representation to binary d9 3 a11 300 static void -gps_get_info(char *info, char *buf, int len) +gps_get_info(u_char *info, char *buf, int len) { int ix; int val; @@@@ -132,8 +132,8 @@@@ build_list_entry(u_char *data, int data_ * the data buffer and an updated lenght */ static u_char * -wpt_common(int *datalen, int state, char *name, double lat, double lon, - char *cmnt) +wpt_common(int *datalen, int state, u_char *name, double lat, double lon, + u_char *cmnt) { u_char *data; int len; @@@@ -147,7 +147,7 @@@@ wpt_common(int *datalen, int state, char /* byte 1-6: waypoint name */ for (ix = 0; ix < 6; ix += 1) { - data[len++] = toupper(name[ix]); + data[len++] = toupper((unsigned char)name[ix]); } /* byte 7-10: latitude */ @@@@ -173,7 +173,7 @@@@ wpt_common(int *datalen, int state, char } static struct gps_list_entry * -d100_wpt(int state, char *name, double lat, double lon, char *cmnt) +d100_wpt(int state, u_char *name, double lat, double lon, u_char *cmnt) { u_char *data; int len; @@@@ -183,7 +183,7 @@@@ d100_wpt(int state, char *name, double l } static struct gps_list_entry * -d101_wpt(int state, char *name, double lat, double lon, char *cmnt, int sym) +d101_wpt(int state, u_char *name, double lat, double lon, u_char *cmnt, int sym) { u_char *data; int len; @@@@ -203,7 +203,7 @@@@ d101_wpt(int state, char *name, double l } static struct gps_list_entry * -d102_wpt(int state, char *name, double lat, double lon, char *cmnt, int sym) +d102_wpt(int state, u_char *name, double lat, double lon, u_char *cmnt, int sym) { u_char *data; int len; @@@@ -224,7 +224,7 @@@@ d102_wpt(int state, char *name, double l } static struct gps_list_entry * -d103_wpt(int state, char *name, double lat, double lon, char *cmnt, int sym, +d103_wpt(int state, u_char *name, double lat, double lon, u_char *cmnt, int sym, int disp) { u_char *data; @@@@ -242,7 +242,7 @@@@ d103_wpt(int state, char *name, double l } static struct gps_list_entry * -d104_wpt(int state, char *name, double lat, double lon, char *cmnt, int sym, +d104_wpt(int state, u_char *name, double lat, double lon, u_char *cmnt, int sym, int disp) { u_char *data; @@@@ -261,7 +261,7 @@@@ d104_wpt(int state, char *name, double l } static struct gps_list_entry * -d105_wpt(int state, double lat, double lon, char *cmnt, int sym) +d105_wpt(int state, double lat, double lon, u_char *cmnt, int sym) { u_char *data; int len; @@@@ -292,7 +292,7 @@@@ d105_wpt(int state, double lat, double l } static struct gps_list_entry * -d106_wpt(int state, double lat, double lon, char *cmnt, int sym) +d106_wpt(int state, double lat, double lon, u_char *cmnt, int sym) { u_char *data; int len; @@@@ -327,7 +327,7 @@@@ d106_wpt(int state, double lat, double l } static struct gps_list_entry * -d107_wpt(int state, char *name, double lat, double lon, char *cmnt, int sym, +d107_wpt(int state, u_char *name, double lat, double lon, u_char *cmnt, int sym, int disp) { u_char *data; @@@@ -354,8 +354,8 @@@@ d107_wpt(int state, char *name, double l } static struct gps_list_entry * -d108_wpt(int state, char *name, double lat, double lon, float alt, - char *cmnt, int sym, int disp, char *info) +d108_wpt(int state, u_char *name, double lat, double lon, float alt, + u_char *cmnt, int sym, int disp, u_char *info) { u_char *data; int len; @@@@ -418,13 +418,13 @@@@ d108_wpt(int state, char *name, double l data[len++] = ' '; /* byte 49-99: ident (max 51 characters) */ - tlen = strlcpy(&data[len], name, GPS_STRING_MAX); + tlen = strlcpy((char *) &data[len], (char *) name, GPS_STRING_MAX); if (++tlen > GPS_STRING_MAX) tlen = GPS_STRING_MAX; len += tlen; /* comment follows name (max 51 characters) */ - tlen = strlcpy(&data[len], cmnt, GPS_STRING_MAX); + tlen = strlcpy((char *) &data[len], (char *) cmnt, GPS_STRING_MAX); if (++tlen > GPS_STRING_MAX) tlen = GPS_STRING_MAX; len += tlen; @@@@ -438,8 +438,8 @@@@ d108_wpt(int state, char *name, double l } static struct gps_list_entry * -d109_wpt(int state, char *name, double lat, double lon, float alt, - char *cmnt, int sym, int disp, char *info) +d109_wpt(int state, u_char *name, double lat, double lon, float alt, + u_char *cmnt, int sym, int disp, u_char *info) { u_char *data; int len; @@@@ -508,13 +508,13 @@@@ d109_wpt(int state, char *name, double l data[len++] = (u_char) 0xff; /* byte 53-103: ident (max GPS_STRING_MAX characters) */ - tlen = strlcpy(&data[len], name, GPS_STRING_MAX); + tlen = strlcpy((char *) &data[len], (char *) name, GPS_STRING_MAX); if (++tlen > GPS_STRING_MAX) tlen = GPS_STRING_MAX; len += tlen; /* comment follows name (max 51 characters) */ - tlen = strlcpy(&data[len], cmnt, GPS_STRING_MAX); + tlen = strlcpy((char *) &data[len], (char *) cmnt, GPS_STRING_MAX); if (++tlen > GPS_STRING_MAX) tlen = GPS_STRING_MAX; len += tlen; @@@@ -545,9 +545,9 @@@@ waypoints(gps_handle gps, u_char *buf, i int sym; /* symbol */ int disp; /* symbol display mode */ float alt; /* altitude */ - char name[GPS_STRING_MAX + 1]; /* waypoint name */ - char cmnt[GPS_STRING_MAX + 1]; /* comment */ - char data[GPS_STRING_MAX + 1]; /* waypoint class and subclass */ + u_char name[GPS_STRING_MAX + 1]; /* waypoint name */ + u_char cmnt[GPS_STRING_MAX + 1]; /* comment */ + u_char data[GPS_STRING_MAX + 1]; /* waypoint class and subclass */ char *beg; char *end; @@@@ -562,10 +562,10 @@@@ waypoints(gps_handle gps, u_char *buf, i data[0] = 0; /* Latitude and longitude */ - sscanf(buf, "%lf %lf", &lat, &lon); + sscanf((char *) buf, "%lf %lf", &lat, &lon); /* key:value pairs */ - for (beg = strchr(buf, ':'); beg; beg = end) { + for (beg = strchr((char *) buf, ':'); beg; beg = end) { end = strchr(beg + 1, ':'); /* len includes space for null */ if (end == NULL) @@@@ -574,7 +574,7 @@@@ waypoints(gps_handle gps, u_char *buf, i len = end - beg - 2; if (len > GPS_STRING_MAX) len = GPS_STRING_MAX; - switch (toupper(beg[-1])) { + switch (toupper((unsigned char)(beg[-1]))) { case 'A': sscanf(&beg[1], "%f", &alt); break; @@@@ -591,10 +591,10 @@@@ waypoints(gps_handle gps, u_char *buf, i sscanf(&beg[1], "%d", &disp); break; case 'I': - strlcpy(name, &beg[1], len); + strlcpy((char *) name, &beg[1], len); break; case 'C': - strlcpy(cmnt, &beg[1], len); + strlcpy((char *) cmnt, &beg[1], len); break; case 'L': /* route link code */ @@@@ -676,7 +676,7 @@@@ d200_route(int num) } static struct gps_list_entry * -d201_route(int num, char *cmnt) +d201_route(int num, u_char *cmnt) { u_char *data; int len; @@@@ -693,7 +693,7 @@@@ d201_route(int num, char *cmnt) } static struct gps_list_entry * -d202_route(char *cmnt) +d202_route(u_char *cmnt) { u_char *data; int len; @@@@ -703,7 +703,7 @@@@ d202_route(char *cmnt) len = 0; data[len++] = p_rte_hdr; - tlen = strlcpy(&data[len], cmnt, GPS_STRING_MAX); + tlen = strlcpy((char *) &data[len], (char *) cmnt, GPS_STRING_MAX); if (++tlen > GPS_STRING_MAX) tlen = GPS_STRING_MAX; len += tlen; @@@@ -724,12 +724,12 @@@@ routes(gps_handle gps, u_char *buf) char *p; int rte; int num; - char cmnt[GPS_STRING_MAX + 1]; + u_char cmnt[GPS_STRING_MAX + 1]; - sscanf(buf, "**%d", &num); - p = strchr(buf, ' '); + sscanf((char *) buf, "**%d", &num); + p = strchr((char *) buf, ' '); if (p) - strlcpy(cmnt, p + 1, GPS_STRING_MAX); + strlcpy((char *) cmnt, p + 1, GPS_STRING_MAX); else cmnt[GPS_STRING_MAX] = 0; gps_printf(gps, 3, "route %d %s\n", num, cmnt); @@@@ -788,13 +788,13 @@@@ track_hdr(gps_handle gps, u_char *buf) u_char *data; int len; int tlen; - char name[GPS_STRING_MAX + 1]; /* track name */ + u_char name[GPS_STRING_MAX + 1]; /* track name */ /* skip any leading whitespace and extract the name */ for (len = 0; buf[len]; len += 1) if (! isspace(buf[len])) break; - strlcpy(name, &buf[len], GPS_STRING_MAX); + strlcpy((char *) name, (char *) &buf[len], GPS_STRING_MAX); data = gps_buffer_new(); len = 0; @@@@ -808,7 +808,7 @@@@ track_hdr(gps_handle gps, u_char *buf) data[len++] = 0xff; /* byte 3-n: ident (max GPS_STRING_MAX characters) */ - tlen = strlcpy(&data[len], name, GPS_STRING_MAX); + tlen = strlcpy((char *) &data[len], (char *) name, GPS_STRING_MAX); if (++tlen > GPS_STRING_MAX) tlen = GPS_STRING_MAX; len += tlen; @@@@ -834,12 +834,12 @@@@ tracks(gps_handle gps, u_char *buf) buf += 19; /* Latitude and longitude */ - sscanf(buf, "%lf %lf", &lat, &lon); + sscanf((char *) buf, "%lf %lf", &lat, &lon); /* look for start flag */ - p = strrchr(buf, ' '); + p = strrchr((char *) buf, ' '); if (p != NULL) - start = strcmp(p+1, "start") == 0; + start = strcmp((char *) p+1, "start") == 0; else start = 0; @@@@ -951,10 +951,10 @@@@ gps_format(gps_handle gps, FILE *stream) int rte; char *p; - while (fgets(buf, sizeof buf, stream)) { + while (fgets((char *) buf, sizeof buf, stream)) { /* kill any trailing newline */ - if ((p = strrchr(buf, '\n')) != NULL) + if ((p = strrchr((char *) buf, '\n')) != NULL) *p = 0; /* skip any leading whitespace */ @@@@ -967,7 +967,7 @@@@ gps_format(gps_handle gps, FILE *stream) continue; a12 15 /* check for list terminator */ - if (buf[ix] == '[' && strncmp(&buf[ix], "[end", 4) == 0) { + if (buf[ix] == '[' && strncmp((char *) &buf[ix], "[end", 4) == 0) { gps_printf(gps, 3, "...end\n"); state = START; } @@@@ -1003,7 +1003,7 @@@@ gps_format(gps_handle gps, FILE *stream) } break; case TRACKS: - if (strncmp(&buf[ix], "Track:", 6) == 0) { + if (strncmp((char *) &buf[ix], "Track:", 6) == 0) { if (gps_get_trk_hdr_type(gps) != 0) entry = track_hdr(gps, &buf[ix + 6]); } else @ 1.3 log @Pointer signedness fixes, to make it build with gcc 4.1.2 which otherwise fails as the Makefile specifies -Wall -Werror. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.2 2006/07/11 17:33:27 gson Exp $ @ 1.2 log @Update garmin-utils to 2.2. Changed since 2.1: - Upload altitude in D108/D109 waypoints @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.1 2004/12/08 16:28:50 gson Exp $ d5 35 d45 1 a45 1 + data[len++] = toupper((unsigned char)(name[ix])); d49 152 d210 129 @ 1.1 log @Cast toupper() arguments to unsigned char to make build succeed with -Werror. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- lib/gpsformat.c.orig 2004-12-04 15:53:31.000000000 +0200 d5 1 a5 1 @@@@ -153,7 +153,7 @@@@ wpt_common(int *datalen, int state, char d14 1 a14 1 @@@@ -584,7 +584,7 @@@@ waypoints(gps_handle gps, u_char *buf, i d21 1 a21 1 /* altitude ignored */ @