head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.164 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.162 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.160 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.158 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.156 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.154 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.152 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.150 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.148 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.146 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.144 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.142 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.140 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.138 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.136 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.134 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.132 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.130 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.128 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.126 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.124 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.122 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.120 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.116 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.96 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.118 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.114 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.112 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.110 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.108 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.106 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.104 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.102 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.100 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.98 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.94 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.92 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.90 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.88 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.86 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.84 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.82 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.80 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.78 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.76 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.74 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.72 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.70 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.68 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.66 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.64 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.62 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.60 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.58 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.56 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.54 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.52 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.50 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.48 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.46 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.44 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.42 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.40 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.38 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.36 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.34 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.32 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.30 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.28 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.26 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.24 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.22 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.20 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.18 pkgsrc-2008Q1:1.2.0.16 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.14 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.12 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.10 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.8 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.6 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.4 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.2 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.1.0.18 pkgsrc-2006Q1-base:1.1 pkgsrc-2005Q4:1.1.0.16 pkgsrc-2005Q4-base:1.1 pkgsrc-2005Q3:1.1.0.14 pkgsrc-2005Q3-base:1.1 pkgsrc-2005Q2:1.1.0.12 pkgsrc-2005Q2-base:1.1 pkgsrc-2005Q1:1.1.0.10 pkgsrc-2005Q1-base:1.1 pkgsrc-2004Q4:1.1.0.8 pkgsrc-2004Q4-base:1.1 pkgsrc-2004Q3:1.1.0.6 pkgsrc-2004Q3-base:1.1 pkgsrc-2004Q2:1.1.0.4 pkgsrc-2004Q2-base:1.1 pkgsrc-2004Q1:1.1.0.2 pkgsrc-2004Q1-base:1.1; locks; strict; comment @# @; 1.2 date 2006.06.30.18.25.43; author tron; state Exp; branches; next 1.1; 1.1 date 2003.12.15.17.02.22; author agc; state Exp; branches; next ; desc @@ 1.2 log @Rename variable "optreset" to "my_optreset" to avoid conflict with global variable used by getopt(3). @ text @$NetBSD$ --- ipw.c.orig 1999-03-30 08:04:12.000000000 +0100 +++ ipw.c 2006-06-30 19:22:53.000000000 +0100 @@@@ -257,7 +257,7 @@@@ static int my_opterr = 1; /* if error message should be printed */ static int my_optind = 1; /* index into parent argv vector */ static int my_optopt; /* character checked for validity */ -static int optreset; /* reset getopt */ +static int my_optreset; /* reset getopt */ static char *my_optarg; /* argument associated with option */ #define BADCH (int)'?' @@@@ -275,9 +275,9 @@@@ static char *place = EMSG; /* option letter processing */ register char *oli = NULL; /* option letter list index */ - if (optreset || ! *place) + if (my_optreset || ! *place) { /* update scanning pointer */ - optreset = 0; + my_optreset = 0; if (my_optind >= nargc || *(place = nargv[my_optind]) != '-') { place = EMSG; @@@@ -782,7 +782,7 @@@@ if (!p) return NULL; - for (q = p + rwhois_prefix_len; *q && !isspace (*q); q++) + for (q = p + rwhois_prefix_len; *q && !isspace (*q) && *q != ':'; q++) continue; srvr_len = q - p; server = (char *) xmalloc (srvr_len + 1); @@@@ -1745,14 +1745,14 @@@@ { static char const ripe1[] = "European Regional Internet Registry/RIPE"; static char const ripe2[] = "RIPE NCC (NET-RIPE-NCC-"; - static char const apnic[] = "Asia Pacific Network Information Center"; + static char const apnic[] = "Asia Pacific Network Information Centre"; static char const nomatch[] = "No match"; static char const updated[] = "Record last updated on "; static char const hostname[] = "Hostname:"; auto char arin_query[200]; try_next_addr: - strcpy (arin_query, "net "); + strcpy (arin_query, "n "); strcat (arin_query, dotted_blockname); whois_data = whois (arin_server, arin_query); if (whois_data == NULL) /* Server must be down! */ @@@@ -1760,8 +1760,15 @@@@ if (strncmp (whois_data, nomatch, sizeof nomatch -1)) { register char const *rwhois_data; + char const *orgname = strstr (whois_data, "OrgName:"); - if (!strncmp (whois_data, ripe1, sizeof ripe1 - 1)) + if (orgname) + { + orgname += sizeof "OrgName:"; + while (isspace (*orgname)) + orgname++; + } + if (orgname && !strncmp (orgname, ripe1, sizeof ripe1 - 1)) { if (try_ripe (dotted_quad)) break; @@@@ -1769,7 +1776,7 @@@@ return 0; } - if (!strncmp (whois_data, ripe2, sizeof ripe2 - 1)) + if (orgname && !strncmp (orgname, ripe2, sizeof ripe2 - 1)) { if (try_ripe (dotted_quad)) break; @@@@ -1777,7 +1784,7 @@@@ return 0; } - if (!strncmp (whois_data, apnic, sizeof apnic - 1)) + if (orgname && !strncmp (orgname, apnic, sizeof apnic - 1)) { if (try_apnic (dotted_quad)) break; @@@@ -1802,6 +1809,7 @@@@ goto try_next_addr; } +#if 0 /* needs fixing */ if (!substr (whois_data, updated)) { /* Handle a special case. ARIN has returned to us a list of @@@@ -1813,6 +1821,7 @@@@ if ((whois_data = arin_grunge (whois_data, addr)) == NULL) return 1; } +#endif if ((rwhois_data = fetch_rwhois_data (whois_data, dotted_quad))) return present_rwhois_style_results (rwhois_data, whois_data); else @ 1.1 log @Apply patch from Geoff C. Wing from PR 22475 to make ipw work properly again after changes to the ARIN whois response. Bump PKGREVISION @ text @d4 22 a25 1 +++ ipw.c 2003-12-15 16:58:12.000000000 +0000 @