From 9047ade2a9d7fed4de179e4cfc53e1589e3c7343 Mon Sep 17 00:00:00 2001 From: wulf Date: Fri, 21 Apr 2006 02:07:53 +0000 Subject: Implemented changes for this package to use the REQD_DIR and CONF_FILES framework for the installation of the configuration files. Fixed compile warning message due to implicit casting --- ham/dpbox/DEINSTALL | 17 -------- ham/dpbox/Makefile | 57 +++++++++++++++++++++++---- ham/dpbox/PLIST | 4 +- ham/dpbox/distinfo | 22 ++++++++--- ham/dpbox/files/dpbox.ini | 2 + ham/dpbox/patches/patch-aa | 88 ++++++++++++++++++++++++++++++------------ ham/dpbox/patches/patch-ag | 57 ++++++++++++++++++++++++--- ham/dpbox/patches/patch-ak | 65 +++++++++++++++++++++++++++++-- ham/dpbox/patches/patch-an | 26 +++++++++++-- ham/dpbox/patches/patch-ao | 26 +++++++++++-- ham/dpbox/patches/patch-aq | 31 +++++++++++++++ ham/dpbox/patches/patch-ar | 63 ++++++++++++++++++++++++++++++ ham/dpbox/patches/patch-as | 13 +++++++ ham/dpbox/patches/patch-at | 56 +++++++++++++++++++++++++++ ham/dpbox/patches/patch-au | 31 +++++++++++++++ ham/dpbox/patches/patch-av | 46 ++++++++++++++++++++++ ham/dpbox/patches/patch-aw | 13 +++++++ ham/dpbox/patches/patch-ax | 24 ++++++++++++ ham/dpbox/patches/patch-ay | 96 ++++++++++++++++++++++++++++++++++++++++++++++ ham/dpbox/patches/patch-az | 12 ++++++ 20 files changed, 676 insertions(+), 73 deletions(-) delete mode 100644 ham/dpbox/DEINSTALL create mode 100644 ham/dpbox/patches/patch-aq create mode 100644 ham/dpbox/patches/patch-ar create mode 100644 ham/dpbox/patches/patch-as create mode 100644 ham/dpbox/patches/patch-at create mode 100644 ham/dpbox/patches/patch-au create mode 100644 ham/dpbox/patches/patch-av create mode 100644 ham/dpbox/patches/patch-aw create mode 100644 ham/dpbox/patches/patch-ax create mode 100644 ham/dpbox/patches/patch-ay create mode 100644 ham/dpbox/patches/patch-az (limited to 'ham') diff --git a/ham/dpbox/DEINSTALL b/ham/dpbox/DEINSTALL deleted file mode 100644 index 27ef83caf6f..00000000000 --- a/ham/dpbox/DEINSTALL +++ /dev/null @@ -1,17 +0,0 @@ -# $NetBSD: DEINSTALL,v 1.1 2001/10/31 21:39:47 zuntum Exp $ -# - -case "$2" in - DEINSTALL) cat < #include #include -@@ -80,7 +80,7 @@ long statclock(void) +@@ -80,7 +80,7 @@ #endif } @@ -20,3 +20,60 @@ $NetBSD: patch-ak,v 1.1 2006/01/24 22:27:07 joerg Exp $ long get_cpuusage(void) { +@@ -557,7 +557,7 @@ + return 129; + + default: +- return tolower(ch); ++ return tolower((u_char) ch); + } + } + +@@ -576,7 +576,7 @@ + return 154; + + default: +- return toupper(ch); ++ return toupper((u_char) ch); + } + } + +@@ -615,7 +615,7 @@ + if (*s == '\0') return false; + } + while (*s != '\0') { +- if (!isdigit(*s++)) { ++ if (!isdigit((u_char) *s++)) { + return false; + } + } +@@ -633,7 +633,7 @@ + if (s[1] == '\0') + return false; + while (*s != '\0') { +- if (!((*s >= 'a' && *s <= 'f') || (*s >= 'A' && *s <= 'F') || isdigit(*s))) ++ if (!((*s >= 'a' && *s <= 'f') || (*s >= 'A' && *s <= 'F') || isdigit((u_char) *s))) + return false; + s++; + } +@@ -669,9 +669,9 @@ + + digit = false; + while (*s != '\0') { +- if (!(*s == 'e' || *s == 'E' || *s == '+' || *s == '-' || *s == '.' || isdigit(*s))) ++ if (!(*s == 'e' || *s == 'E' || *s == '+' || *s == '-' || *s == '.' || isdigit((u_char) *s))) + return false; +- else if (isdigit(*s)) ++ else if (isdigit((u_char) *s)) + digit = true; + } + +@@ -702,7 +702,7 @@ + return c - 87; + + default: +- if (isdigit(c)) ++ if (isdigit((u_char) c)) + return c - '0'; + else + return 0; diff --git a/ham/dpbox/patches/patch-an b/ham/dpbox/patches/patch-an index 2b0a750b8f4..53f437c8c94 100644 --- a/ham/dpbox/patches/patch-an +++ b/ham/dpbox/patches/patch-an @@ -1,8 +1,8 @@ -$NetBSD: patch-an,v 1.1 2006/01/24 22:27:07 joerg Exp $ +$NetBSD: patch-an,v 1.2 2006/04/21 02:07:54 wulf Exp $ ---- box_sys.c.orig 2006-01-24 22:02:52.000000000 +0000 -+++ box_sys.c -@@ -1679,6 +1679,14 @@ void show_version(short unr, boolean ext +--- box_sys.c.orig 2000-04-27 22:18:53.000000000 +0930 ++++ box_sys.c 2006-04-14 11:53:42.000000000 +0930 +@@ -1679,6 +1679,14 @@ wlnuser(unr, "NetBSD porting : (c) 1999 Berndt Josef Wulf, VK5ABN"); #define __dp_version_ok #endif @@ -17,3 +17,21 @@ $NetBSD: patch-an,v 1.1 2006/01/24 22:27:07 joerg Exp $ #ifndef __dp_version_ok sprintf(hs, "dpbox v%s%s %s", dp_vnr, dp_vnr_sub, dp_date); wuser(unr, hs); +@@ -3123,7 +3131,7 @@ + for (x = 1; x <= 53; x++) { + do { + c = dp_randomize(48, 122); +- } while (!isalnum(c)); ++ } while (!isalnum((u_char) c)); + sprintf(hs + strlen(hs), "%c", c); + + } +@@ -3174,7 +3182,7 @@ + for (x = 1; x <= 1620; x++) { + do { + c = dp_randomize(48, 122); +- } while (!isalnum(c)); ++ } while (!isalnum((u_char) c)); + sfwrite(k, 1, &c); + } + sfclose(&k); diff --git a/ham/dpbox/patches/patch-ao b/ham/dpbox/patches/patch-ao index b2858c82f10..2e427965c59 100644 --- a/ham/dpbox/patches/patch-ao +++ b/ham/dpbox/patches/patch-ao @@ -1,8 +1,26 @@ -$NetBSD: patch-ao,v 1.1 2006/01/24 22:27:07 joerg Exp $ +$NetBSD: patch-ao,v 1.2 2006/04/21 02:07:54 wulf Exp $ ---- box.c.orig 2006-01-24 22:12:35.000000000 +0000 -+++ box.c -@@ -4297,6 +4297,8 @@ void begruessung(short unr) +--- box.c.orig 2000-04-27 22:18:52.000000000 +0930 ++++ box.c 2006-04-14 11:45:42.000000000 +0930 +@@ -2226,7 +2226,7 @@ + } + FORLIM1 = strlen(hs); + for (x = 0; x < FORLIM1; x++) { +- if (!(isupper(hs[x]) || isdigit(hs[x]))) hs[x] = ' '; ++ if (!(isupper((u_char)hs[x]) || isdigit((u_char)hs[x]))) hs[x] = ' '; + } + wlnuser(unr, hs); + rset = false; +@@ -3609,7 +3609,7 @@ + x = k + 1; + l = strlen(com); + while (x <= l && com[x - 1] == ' ') x++; +- while (x <= l && isdigit(com[x - 1])) { ++ while (x <= l && isdigit((u_char) com[x - 1])) { + sprintf(hs + strlen(hs), "%c", com[x - 1]); + x++; + } +@@ -4297,6 +4297,8 @@ wlnuser(unr, hs); #ifdef __NetBSD__ sprintf(w, "dpbox (NetBSD) v%s%s", dp_vnr, dp_vnr_sub); diff --git a/ham/dpbox/patches/patch-aq b/ham/dpbox/patches/patch-aq new file mode 100644 index 00000000000..6985a550a8d --- /dev/null +++ b/ham/dpbox/patches/patch-aq @@ -0,0 +1,31 @@ +$NetBSD: patch-aq,v 1.1 2006/04/21 02:07:54 wulf Exp $ + +--- box_mem.c.orig 2000-04-27 22:18:53.000000000 +0930 ++++ box_mem.c 2006-04-14 12:46:08.000000000 +0930 +@@ -334,7 +334,7 @@ + boxendbusy(); + } + +-#undef bsize; ++#undef bsize + + static long find_bidhash(char *bid) + { +@@ -846,7 +846,7 @@ + while (ct < k) { + ct++; + c = zeile[ct - 1]; +- if (!isdigit(c)) { ++ if (!isdigit((u_char) c)) { + if (c == '#') { + if (ct > 6) + return size; +@@ -894,7 +894,7 @@ + if (rp1[1] == 'B' && rp1[2] == 'I' && rp1[3] == 'N' && rp1[4] == '#') { + i = 4; + while (++i <= remainder && i < 16) { +- if (!isdigit(rp1[i])) { ++ if (!isdigit((u_char) rp1[i])) { + if (rp1[i] == '#') { + if (i > 5) { /* valid header */ + binstart = size; /* this is a fallback in case of truncated input buffer */ diff --git a/ham/dpbox/patches/patch-ar b/ham/dpbox/patches/patch-ar new file mode 100644 index 00000000000..01531e7674f --- /dev/null +++ b/ham/dpbox/patches/patch-ar @@ -0,0 +1,63 @@ +$NetBSD: patch-ar,v 1.1 2006/04/21 02:07:54 wulf Exp $ + +--- box_scan.c.orig 2006-04-14 12:01:07.000000000 +0930 ++++ box_scan.c 2006-04-14 12:03:25.000000000 +0930 +@@ -275,17 +275,17 @@ + short l; + + if (rdate[6] != '/') { +- if (rdate[7] == '/' && rdate[0] == '1' && isdigit(rdate[1]) && isdigit(rdate[2])) { /* fbb 5.15 y2k-bug */ ++ if (rdate[7] == '/' && rdate[0] == '1' && isdigit((u_char) rdate[1]) && isdigit((u_char) rdate[2])) { /* fbb 5.15 y2k-bug */ + rdate++; + } else { + return false; + } + } + l = strlen(rdate); +- if (l != 11 && (!(l == 12 && isalpha(rdate[11])))) return false; +- if ( !isdigit(rdate[0]) || !isdigit(rdate[1]) || !isdigit(rdate[2]) || !isdigit(rdate[3]) +- || !isdigit(rdate[4]) || !isdigit(rdate[5]) || !isdigit(rdate[7]) || !isdigit(rdate[8]) +- || !isdigit(rdate[9]) || !isdigit(rdate[10])) return false; ++ if (l != 11 && (!(l == 12 && isalpha((u_char) rdate[11])))) return false; ++ if ( !isdigit((u_char) rdate[0]) || !isdigit((u_char) rdate[1]) || !isdigit((u_char) rdate[2]) || !isdigit((u_char) rdate[3]) ++ || !isdigit((u_char) rdate[4]) || !isdigit((u_char) rdate[5]) || !isdigit((u_char) rdate[7]) || !isdigit((u_char) rdate[8]) ++ || !isdigit((u_char) rdate[9]) || !isdigit((u_char) rdate[10])) return false; + l = double_val(rdate, 0); /* year */ + if (l < 70 && l > 38) return false; + l = double_val(rdate, 2); /* month */ +@@ -313,7 +313,7 @@ + l = strlen(timestr); + if (l < 10 || !check_rdate(×tr[2])) return 0; + /* fbb515 y2k bug? */ +- if (timestr[2] == '1' && isdigit(timestr[3]) && isdigit(timestr[4])) fbby2kbug = 1; ++ if (timestr[2] == '1' && isdigit((u_char) timestr[3]) && isdigit((u_char) timestr[4])) fbby2kbug = 1; + if ((l > 13+fbby2kbug) && (timestr[13+fbby2kbug] != ' ') && (upcase_(timestr[13+fbby2kbug]) != 'Z')) + only_date = true; + if (!only_date) { +@@ -362,7 +362,7 @@ + *para = '\0'; + p = strchr(rline, '@'); + if (p != NULL) { +- if (p > rline && isdigit(p[-1])) { ++ if (p > rline && isdigit((u_char) p[-1])) { + p++; + nstrcpy(para, p, LEN_MBX); + del_comment(para, ' '); +@@ -405,7 +405,7 @@ + char *p; + + p = s; +- while (*s) if (isalnum(*s)) *p++ = *s++; else s++; ++ while (*s) if (isalnum((u_char) *s)) *p++ = *s++; else s++; + *p = '\0'; + return p == s; + } +@@ -872,7 +872,7 @@ + } + } + +- if (wprotupdate && isxdigit(hs[0]) && isxdigit(hs[1]) && hs[2] == ' ') { ++ if (wprotupdate && isxdigit((u_char) hs[0]) && isxdigit((u_char) hs[1]) && hs[2] == ' ') { + if (process_wprotline(hs, actwpfilesender, true) == -2) wprotupdate = false; + continue; + } diff --git a/ham/dpbox/patches/patch-as b/ham/dpbox/patches/patch-as new file mode 100644 index 00000000000..e2abcb20ffd --- /dev/null +++ b/ham/dpbox/patches/patch-as @@ -0,0 +1,13 @@ +$NetBSD: patch-as,v 1.1 2006/04/21 02:07:54 wulf Exp $ + +--- box_sf.c.orig 2006-04-14 11:49:12.000000000 +0930 ++++ box_sf.c 2006-04-14 11:49:40.000000000 +0930 +@@ -3575,7 +3575,7 @@ + + case '!': /* send with resume offset */ + w[0] = '\0'; +- while (strlen(eingabe) > 1 && isdigit(eingabe[1])) { ++ while (strlen(eingabe) > 1 && isdigit((u_char) eingabe[1])) { + sprintf(w + strlen(w), "%c", eingabe[1]); + strdelete(eingabe, 1, 1); + } diff --git a/ham/dpbox/patches/patch-at b/ham/dpbox/patches/patch-at new file mode 100644 index 00000000000..6ae4ad53418 --- /dev/null +++ b/ham/dpbox/patches/patch-at @@ -0,0 +1,56 @@ +$NetBSD: patch-at,v 1.1 2006/04/21 02:07:54 wulf Exp $ + +--- box_sub.c.orig 2006-04-14 11:50:30.000000000 +0930 ++++ box_sub.c 2006-04-14 11:52:09.000000000 +0930 +@@ -2693,9 +2693,9 @@ + + notnum = false; + for (x = 0; x < l; x++) { +- if (!(rubrik[x] == '_' || rubrik[x] == '-' || isupper(rubrik[x]) || isdigit(rubrik[x]))) ++ if (!(rubrik[x] == '_' || rubrik[x] == '-' || isupper((u_char) rubrik[x]) || isdigit((u_char) rubrik[x]))) + return false; +- else if (isupper(rubrik[x])) ++ else if (isupper((u_char) rubrik[x])) + notnum = true; + } + return notnum; +@@ -2781,7 +2781,7 @@ + p = rubrik; + p2 = rubrik; + while ((c = upcase_(*p++))) { +- if (c == '_' || c == '-' || isupper(c) || isdigit(c)) ++ if (c == '_' || c == '-' || isupper((u_char) c) || isdigit((u_char) c)) + *p2++ = c; + } + *p2 = '\0'; +@@ -3347,7 +3347,7 @@ + + case '#': + if ((unsigned long)strlen(inp) < 32 && /* !!!CHECK */ +- ((1L << strlen(inp)) & 0x1c) != 0 && isdigit(inp[1])) { ++ ((1L << strlen(inp)) & 0x1c) != 0 && isdigit((u_char) inp[1])) { + strdelete(inp, 1, 1); + strcpy(lt, inp); + return true; +@@ -3692,7 +3692,7 @@ + *hs = '\0'; + y = x; + y++; +- while (y <= t && eingabe[y - 1] != ' ' && isdigit(eingabe[y - 1])) { ++ while (y <= t && eingabe[y - 1] != ' ' && isdigit((u_char) eingabe[y - 1])) { + sprintf(hs + strlen(hs), "%c", eingabe[y - 1]); + y++; + } +@@ -3746,10 +3746,10 @@ + + FORLIM = strlen(ein); + for (x = 0; x < FORLIM; x++) { +- if (isdigit(ein[x])) ++ if (isdigit((u_char) ein[x])) + numbers = true; + if (ein[x] == '_' || (ein[x] & 255) == 158 || (ein[x] & 255) == 154 || +- (ein[x] & 255) == 153 || (ein[x] & 255) == 142 || isupper(ein[x])) ++ (ein[x] & 255) == 153 || (ein[x] & 255) == 142 || isupper((u_char) ein[x])) + alphab = true; + if (ein[x] == '-') + slashct++; diff --git a/ham/dpbox/patches/patch-au b/ham/dpbox/patches/patch-au new file mode 100644 index 00000000000..ec31a17607c --- /dev/null +++ b/ham/dpbox/patches/patch-au @@ -0,0 +1,31 @@ +$NetBSD: patch-au,v 1.1 2006/04/21 02:07:54 wulf Exp $ + +--- crawler.c.orig 2006-04-14 12:03:52.000000000 +0930 ++++ crawler.c 2006-04-14 12:08:40.000000000 +0930 +@@ -191,7 +191,7 @@ + return (*wlen > 0); + } else { + n = p; +- while ((c = *n++) && isdigit(c)); ++ while ((c = *n++) && isdigit((u_char) c)); + if (!c) { + strcpy(--outw, p); + *wlen = (--n - *inw) - 1; +@@ -219,7 +219,7 @@ + continue; + + wlen++; +- c = tolower(c); ++ c = tolower((u_char) c); + + switch ((unsigned char)c) { + +@@ -259,7 +259,7 @@ + *outw++ = c; + ct++; + if (nonum == 0) +- if (!isdigit(c)) ++ if (!isdigit((u_char) c)) + nonum = 1; + break; + } diff --git a/ham/dpbox/patches/patch-av b/ham/dpbox/patches/patch-av new file mode 100644 index 00000000000..a6a6db31ec5 --- /dev/null +++ b/ham/dpbox/patches/patch-av @@ -0,0 +1,46 @@ +$NetBSD: patch-av,v 1.1 2006/04/21 02:07:54 wulf Exp $ + +--- dpputlinks.c.orig 2006-04-14 12:10:10.000000000 +0930 ++++ dpputlinks.c 2006-04-14 12:11:41.000000000 +0930 +@@ -45,11 +45,11 @@ + *o = '\0'; + l = strlen(s); + if (l > 55 && s[13] == '&' && s[5] == ' ' && s[12] == ' ' +- && s[17] == ' ' && s[30] == ' ' && s[56] == ' ' && isdigit(s[55]) +- && isdigit(s[29])) { ++ && s[17] == ' ' && s[30] == ' ' && s[56] == ' ' && isdigit((u_char) s[55]) ++ && isdigit((u_char) s[29])) { + + for (x = 18; x <= 25; x++) { +- if (s[x] != '.') board[x-18] = toupper(s[x]); ++ if (s[x] != '.') board[x-18] = toupper((u_char) s[x]); + else board[x-18] = '\0'; + } + board[8] = '\0'; +@@ -105,8 +105,8 @@ + if (token != NULL) { + token++;token++; + for (x = 1; x < 9; x++) { +- if (isalnum(*token) || *token == '_' || *token == '-' || *token == '/') +- *t2++ = toupper(*token++); ++ if (isalnum((u_char) *token) || *token == '_' || *token == '-' || *token == '/') ++ *t2++ = toupper((u_char) *token++); + else + x = 9; + } +@@ -120,12 +120,12 @@ + *o = '\0'; + l = strlen(s); + if (l > 33 && s[23] == ':' && s[4] == ' ' && s[11] == ' ' +- && s[20] == ' ' && s[26] == ' ' && s[33] == ' ' && isdigit(s[3]) +- && isdigit(s[12])) { ++ && s[20] == ' ' && s[26] == ' ' && s[33] == ' ' && isdigit((u_char) s[3]) ++ && isdigit((u_char) s[12])) { + + token = nums; + for (x = 0; x <= 3; x++) { +- if (isdigit(s[x])) *token++ = s[x]; ++ if (isdigit((u_char) s[x])) *token++ = s[x]; + } + *token = '\0'; + num = atoi(nums); diff --git a/ham/dpbox/patches/patch-aw b/ham/dpbox/patches/patch-aw new file mode 100644 index 00000000000..c95d0dc6a3d --- /dev/null +++ b/ham/dpbox/patches/patch-aw @@ -0,0 +1,13 @@ +$NetBSD: patch-aw,v 1.1 2006/04/21 02:07:54 wulf Exp $ + +--- yapp.c.orig 2006-04-14 11:54:19.000000000 +0930 ++++ yapp.c 2006-04-14 11:54:42.000000000 +0930 +@@ -505,7 +505,7 @@ + + w[0] = '\0'; + x = 4; +- while (x <= len && isdigit(yapp->buffer[x])) { ++ while (x <= len && isdigit((u_char) yapp->buffer[x])) { + sprintf(w + strlen(w), "%c", yapp->buffer[x]); + x++; + } diff --git a/ham/dpbox/patches/patch-ax b/ham/dpbox/patches/patch-ax new file mode 100644 index 00000000000..e25a74e30f9 --- /dev/null +++ b/ham/dpbox/patches/patch-ax @@ -0,0 +1,24 @@ +$NetBSD: patch-ax,v 1.1 2006/04/21 02:07:54 wulf Exp $ + +--- dpgate.c.orig 2006-04-14 12:12:16.000000000 +0930 ++++ dpgate.c 2006-04-14 12:12:45.000000000 +0930 +@@ -155,7 +155,7 @@ + if (buf[i] == '\r') { + putchar('\n'); + } +- else if (isprint(buf[i])) ++ else if (isprint((u_char) buf[i])) + putchar(buf[i]); + else + putchar('.'); +@@ -696,8 +696,8 @@ + while (*i) { + if (*i == '%' && strlen(i) > 2 && i[1] != '%') { + i++; +- h[0] = toupper(*i++); +- h[1] = toupper(*i++); ++ h[0] = toupper((u_char) *i++); ++ h[1] = toupper((u_char) *i++); + h[2] = '\0'; + r = 32; + sscanf(h, "%X", &r); diff --git a/ham/dpbox/patches/patch-ay b/ham/dpbox/patches/patch-ay new file mode 100644 index 00000000000..d9113250f0a --- /dev/null +++ b/ham/dpbox/patches/patch-ay @@ -0,0 +1,96 @@ +$NetBSD: patch-ay,v 1.1 2006/04/21 02:07:54 wulf Exp $ + +--- box_wp.c.orig 2006-04-14 11:59:04.000000000 +0930 ++++ box_wp.c 2006-04-14 12:00:39.000000000 +0930 +@@ -100,26 +100,26 @@ + + get_pquoted(&p, hs); /* version */ + s = hs; +- while (*s) if (!isdigit(*s++)) return -1; ++ while (*s) if (!isdigit((u_char) *s++)) return -1; + wpb->version = atol(hs); + if (!valid_wprot_version(wpb->version)) return -1; + + get_pquoted(&p, hs); /* timestamp */ + s = hs; +- while (*s) if (!isdigit(*s++)) return -1; ++ while (*s) if (!isdigit((u_char) *s++)) return -1; + wpb->timestamp = atol(hs); + if (!valid_wprot_timestamp(wpb->timestamp)) return -1; + + get_pquoted(&p, hs); /* hops */ + s = hs; +- while (*s) if (!isdigit(*s++)) return -1; ++ while (*s) if (!isdigit((u_char) *s++)) return -1; + wpb->hops = atoi(hs); + if (wpb->hops < 1) return -1; + if (wpb->hops > MAXWPHOPS) return -1; + + get_pquoted(&p, hs); /* quality */ + s = hs; +- while (*s) if (!isdigit(*s++)) return -1; ++ while (*s) if (!isdigit((u_char) *s++)) return -1; + wpb->quality = atol(hs); + + get_pquoted(&p, hs); /* must be empty */ +@@ -197,7 +197,7 @@ + + get_pquoted(&p, hs); /* version */ + s = hs; +- while (*s) if (!isdigit(*s++)) return -1; ++ while (*s) if (!isdigit((u_char) *s++)) return -1; + wpb->version = atol(hs); + if (!valid_wprot_version(wpb->version)) return -1; + +@@ -205,7 +205,7 @@ + if (!strcmp(hs, "?")) wpb->status = 0; + else { + s = hs; +- while (*s) if (!isdigit(*s++)) return -1; ++ while (*s) if (!isdigit((u_char) *s++)) return -1; + wpb->status = atoi(hs); + } + +@@ -223,13 +223,13 @@ + + get_pquoted(&p, hs); /* timestamp */ + s = hs; +- while (*s) if (!isdigit(*s++)) return -1; ++ while (*s) if (!isdigit((u_char) *s++)) return -1; + wpb->timestamp = atol(hs); + if (!valid_wprot_timestamp(wpb->timestamp)) return -1; + + get_pquoted(&p, hs); /* hops */ + s = hs; +- while (*s) if (!isdigit(*s++)) return -1; ++ while (*s) if (!isdigit((u_char) *s++)) return -1; + wpb->hops = atoi(hs); + if (wpb->hops < 1) return -1; + if (wpb->hops > MAXWPHOPS) return -1; +@@ -312,7 +312,7 @@ + + get_pquoted(&p, hs); /* timestamp */ + s = hs; +- while (*s) if (!isdigit(*s++)) { ++ while (*s) if (!isdigit((u_char) *s++)) { + debug(5, -1, 228, "invalid digit in timestamp"); + return -1; + } +@@ -332,7 +332,7 @@ + + get_pquoted(&p, hs); /* hops */ + s = hs; +- while (*s) if (!isdigit(*s++)) { ++ while (*s) if (!isdigit((u_char) *s++)) { + debug(5, -1, 228, "invalid digit in hops"); + return -1; + } +@@ -435,7 +435,7 @@ + + get_pquoted(&p, hs); /* hops */ + s = hs; +- while (*s) if (!isdigit(*s++)) return -1; ++ while (*s) if (!isdigit((u_char) *s++)) return -1; + wpb->hops = atoi(hs); + if (wpb->hops < 1) return -1; + if (wpb->hops > MAXWPHOPS) return -1; diff --git a/ham/dpbox/patches/patch-az b/ham/dpbox/patches/patch-az new file mode 100644 index 00000000000..290fad4b642 --- /dev/null +++ b/ham/dpbox/patches/patch-az @@ -0,0 +1,12 @@ +$NetBSD: patch-az,v 1.1 2006/04/21 02:07:54 wulf Exp $ +--- box_rout.c.orig 2006-04-14 12:46:43.000000000 +0930 ++++ box_rout.c 2006-04-14 12:47:09.000000000 +0930 +@@ -1837,7 +1837,7 @@ + strsub(adesc, hs, i + 1, k - i - 1); + strdelete(hs, 1, k); + get_word(hs, w1); +- if (*w1 != '\0' && isalpha(w1[0])) ++ if (*w1 != '\0' && isalpha((u_char) w1[0])) + sprintf(adesc + strlen(adesc), " %s", w1); + } + } -- cgit v1.2.3