head 1.4; access; symbols pkgsrc-2026Q1:1.4.0.114 pkgsrc-2026Q1-base:1.4 pkgsrc-2025Q4:1.4.0.112 pkgsrc-2025Q4-base:1.4 pkgsrc-2025Q3:1.4.0.110 pkgsrc-2025Q3-base:1.4 pkgsrc-2025Q2:1.4.0.108 pkgsrc-2025Q2-base:1.4 pkgsrc-2025Q1:1.4.0.106 pkgsrc-2025Q1-base:1.4 pkgsrc-2024Q4:1.4.0.104 pkgsrc-2024Q4-base:1.4 pkgsrc-2024Q3:1.4.0.102 pkgsrc-2024Q3-base:1.4 pkgsrc-2024Q2:1.4.0.100 pkgsrc-2024Q2-base:1.4 pkgsrc-2024Q1:1.4.0.98 pkgsrc-2024Q1-base:1.4 pkgsrc-2023Q4:1.4.0.96 pkgsrc-2023Q4-base:1.4 pkgsrc-2023Q3:1.4.0.94 pkgsrc-2023Q3-base:1.4 pkgsrc-2023Q2:1.4.0.92 pkgsrc-2023Q2-base:1.4 pkgsrc-2023Q1:1.4.0.90 pkgsrc-2023Q1-base:1.4 pkgsrc-2022Q4:1.4.0.88 pkgsrc-2022Q4-base:1.4 pkgsrc-2022Q3:1.4.0.86 pkgsrc-2022Q3-base:1.4 pkgsrc-2022Q2:1.4.0.84 pkgsrc-2022Q2-base:1.4 pkgsrc-2022Q1:1.4.0.82 pkgsrc-2022Q1-base:1.4 pkgsrc-2021Q4:1.4.0.80 pkgsrc-2021Q4-base:1.4 pkgsrc-2021Q3:1.4.0.78 pkgsrc-2021Q3-base:1.4 pkgsrc-2021Q2:1.4.0.76 pkgsrc-2021Q2-base:1.4 pkgsrc-2021Q1:1.4.0.74 pkgsrc-2021Q1-base:1.4 pkgsrc-2020Q4:1.4.0.72 pkgsrc-2020Q4-base:1.4 pkgsrc-2020Q3:1.4.0.70 pkgsrc-2020Q3-base:1.4 pkgsrc-2020Q2:1.4.0.66 pkgsrc-2020Q2-base:1.4 pkgsrc-2020Q1:1.4.0.46 pkgsrc-2020Q1-base:1.4 pkgsrc-2019Q4:1.4.0.68 pkgsrc-2019Q4-base:1.4 pkgsrc-2019Q3:1.4.0.64 pkgsrc-2019Q3-base:1.4 pkgsrc-2019Q2:1.4.0.62 pkgsrc-2019Q2-base:1.4 pkgsrc-2019Q1:1.4.0.60 pkgsrc-2019Q1-base:1.4 pkgsrc-2018Q4:1.4.0.58 pkgsrc-2018Q4-base:1.4 pkgsrc-2018Q3:1.4.0.56 pkgsrc-2018Q3-base:1.4 pkgsrc-2018Q2:1.4.0.54 pkgsrc-2018Q2-base:1.4 pkgsrc-2018Q1:1.4.0.52 pkgsrc-2018Q1-base:1.4 pkgsrc-2017Q4:1.4.0.50 pkgsrc-2017Q4-base:1.4 pkgsrc-2017Q3:1.4.0.48 pkgsrc-2017Q3-base:1.4 pkgsrc-2017Q2:1.4.0.44 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.4.0.42 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.40 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.38 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.36 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.4.0.34 pkgsrc-2016Q1-base:1.4 pkgsrc-2015Q4:1.4.0.32 pkgsrc-2015Q4-base:1.4 pkgsrc-2015Q3:1.4.0.30 pkgsrc-2015Q3-base:1.4 pkgsrc-2015Q2:1.4.0.28 pkgsrc-2015Q2-base:1.4 pkgsrc-2015Q1:1.4.0.26 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.4.0.24 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.4.0.22 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.4.0.20 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.4.0.18 pkgsrc-2014Q1-base:1.4 pkgsrc-2013Q4:1.4.0.16 pkgsrc-2013Q4-base:1.4 pkgsrc-2013Q3:1.4.0.14 pkgsrc-2013Q3-base:1.4 pkgsrc-2013Q2:1.4.0.12 pkgsrc-2013Q2-base:1.4 pkgsrc-2013Q1:1.4.0.10 pkgsrc-2013Q1-base:1.4 pkgsrc-2012Q4:1.4.0.8 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.4.0.6 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.4.0.4 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.4.0.2 pkgsrc-2012Q1-base:1.4 pkgsrc-2011Q4:1.3.0.40 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.38 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.36 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.34 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.32 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.30 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.28 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.26 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.24 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.22 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.20 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.18 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.16 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.14 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.12 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.10 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.8 pkgsrc-2008Q1:1.3.0.6 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.4 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.2 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.2.0.14 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.12 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.10 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.8 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.6 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.4 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.2 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.1.0.24 pkgsrc-2005Q3-base:1.1 pkgsrc-2005Q2:1.1.0.22 pkgsrc-2005Q2-base:1.1 pkgsrc-2005Q1:1.1.0.20 pkgsrc-2005Q1-base:1.1 pkgsrc-2004Q4:1.1.0.18 pkgsrc-2004Q4-base:1.1 pkgsrc-2004Q3:1.1.0.16 pkgsrc-2004Q3-base:1.1 pkgsrc-2004Q2:1.1.0.14 pkgsrc-2004Q2-base:1.1 pkgsrc-2004Q1:1.1.0.12 pkgsrc-2004Q1-base:1.1 pkgsrc-2003Q4:1.1.0.10 pkgsrc-2003Q4-base:1.1 netbsd-1-6-1:1.1.0.6 netbsd-1-6-1-base:1.1 netbsd-1-6:1.1.0.8 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.0.4 pkgviews-base:1.1 buildlink2:1.1.0.2 buildlink2-base:1.1 netbsd-1-5-PATCH003:1.1; locks; strict; comment @# @; 1.4 date 2012.01.25.09.56.08; author he; state Exp; branches; next 1.3; 1.3 date 2007.10.02.20.23.08; author heinz; state Exp; branches; next 1.2; 1.2 date 2005.12.18.18.37.16; author joerg; state Exp; branches; next 1.1; 1.1 date 2002.04.01.00.04.44; author dmcmahill; state Exp; branches; next ; desc @@ 1.4 log @Update patches for this package so that it builds with -Werror and -Wall with the gcc in NetBSD 5.1, i.e. gcc 4.1.3. Fixes prompted by reports that a build outside of pkgsrc for "64-bit Linux" (amd64) but using this set of patches, gets a segfault, and this fixes that problem. Bump pkgrevision. @ text @$NetBSD$ A number of changes to make this build with no warnings under -Wall. --- classes/config.c.orig 1994-10-05 05:18:21.000000000 +0000 +++ classes/config.c @@@@ -1,8 +1,12 @@@@ #define CLASS_Config_PRIVATE #include "config.h" +#include #include #include +#ifdef HAVE_STRERROR +#include +#endif #define DFLT_NFIELDS 10 #define START_FIELD(S) \ @@@@ -31,13 +35,12 @@@@ static char quote_delimiters[] = "'\""; * a normal character. */ -static Config config_expand(); -static unsigned char* config_copy(); -static unsigned char* get_quoted_string(); - -extern char* malloc(); -extern char* realloc(); -extern char* strdup(); +static Config config_expand(Config, char*); +static char* config_copy(Config, char*, char**, int); +static char* get_quoted_string(char, char*, char**); + +void config_setbreak (Config, const char*, const char*); + static int dflt_options = CFG_OPT_UCASE; @@@@ -45,7 +48,6 @@@@ Config config_new() { Config self; - register char* p; self = (Config)calloc (1, sizeof (*self)); config_setbreak (self, default_separators, default_delimiters); @@@@ -69,17 +71,13 @@@@ Config self; return 0; } -#ifndef __STDC__ -# define const -#endif -int +void config_setbreak (self, separators, delimiters) -Config self; -const char* separators; -const char* delimiters; -#undef const + Config self; + const char* separators; + const char* delimiters; { - register unsigned char* p; + unsigned char* p; self->separators = (char*)separators; self->delimiters = (char*)delimiters; @@@@ -112,21 +110,21 @@@@ Config self; } /* Okay, start stashing tokens away */ +int config_scanbuf (self, buf) -Config self; -char* buf; + Config self; + char* buf; { - register unsigned char* fr; - unsigned char* to; + char* fr; + char* to; int type; - int len; self->buf = buf; self->tbuf = strdup(buf); self->nfields = 0; - fr = (unsigned char*)self->tbuf; to = (unsigned char*)self->buf; - while ((type = self->brk[*fr]) != BRK_EOS) { + fr = self->tbuf; to = self->buf; + while ((type = self->brk[(unsigned char)*fr]) != BRK_EOS) { switch (type) { case BRK_QUOTE: START_FIELD(to); @@@@ -176,8 +174,8 @@@@ int options; /* Private methods */ static Config config_expand (self, fieldstart) -Config self; -char* fieldstart; + Config self; + char* fieldstart; { self->maxfields += DFLT_NFIELDS; @@@@ -229,11 +227,11 @@@@ char* fieldstart; * returns: the location in where the scan terminated (i.e., the * terminating instances of ). */ -static unsigned char* +static char* get_quoted_string (qc, ss, rsd) -char qc; -register unsigned char* ss; -char** rsd; + char qc; + char* ss; + char** rsd; { int v; register char* sd = *rsd; @@@@ -251,11 +249,12 @@@@ char** rsd; ss++; /* \xDD: hex digit escape */ - if (*ss == 'x' && isxdigit (ss[1])) { + if (*ss == 'x' && isxdigit ((unsigned char)ss[1])) { v = 0; ss++; - v = (hex_ord(*ss) << 4) + hex_ord(ss[1]); + v = (hex_ord((unsigned char)*ss) << 4) + + hex_ord((unsigned char)ss[1]); ss++; *sd++ = v; continue; @@@@ -264,10 +263,12 @@@@ char** rsd; /* \DDD: octal digit escape. Up to 3 octal * digits. */ - else if (isodigit(*ss)) { + else if (isodigit((unsigned char)*ss)) { int n = 3; - for (v = 0; isodigit(*ss) && n > 0; ss++,n--) { + for (v = 0; isodigit((unsigned char)*ss) && + n > 0; ss++,n--) + { v = (v << 3) + *ss - '0'; } ss--; @@@@ -297,15 +298,15 @@@@ char** rsd; } /* Copy characters and map to upper-case */ -static unsigned char* +static char* config_copy (self, fr, pto, brk) -Config self; -register unsigned char* fr; -unsigned char** pto; -int brk; + Config self; + char* fr; + char** pto; + int brk; { - register unsigned char* to = *pto; - register unsigned char c; + char* to = *pto; + unsigned char c; if (self->options & CFG_OPT_UCASE) { while ((self->brk[c = *fr] & brk) == 0) { @ 1.3 log @Added compatibility fixes for NetBSD/FreeBSD/Linux/Solaris provided by Yakovetsky Vladimir in PR pkg/36942. Shut up warning by pkglint (PLIST). Introduced PKGMANDIR in software Makefile. @ text @d1 1 a1 1 $NetBSD: patch-af,v 1.2 2005/12/18 18:37:16 joerg Exp $ d3 3 a5 1 --- classes/config.c.orig 1994-10-05 06:18:21.000000000 +0100 d20 3 a22 3 @@@@ -35,10 +39,6 @@@@ static Config config_expand(); static unsigned char* config_copy(); static unsigned char* get_quoted_string(); d24 4 d31 7 a37 1 - d40 57 a96 2 Config @@@@ -130,7 +130,7 @@@@ char* buf; d100 77 a176 4 - fr = get_quoted_string (*fr, fr+1, &to); + fr = get_quoted_string (*fr, fr+1, (char**)&to); fr++; /* skip terminating quote */ break; d178 2 @ 1.2 log @Deorbit some pre-ANSI crap which breaks on DragonFly: - errno from errno.h - calloc and malloc from stdlib.h - strdup from string.h @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- classes/config.c.orig 1994-10-05 05:18:21.000000000 +0000 d5 1 a5 1 @@@@ -1,6 +1,7 @@@@ d12 3 d16 3 a18 1 @@@@ -35,10 +36,6 @@@@ static Config config_expand(); d29 9 @ 1.1 log @fix for LP64 systems. Mostly just adding missing header files. @ text @d3 1 a3 1 --- classes/config.c.orig Wed Oct 5 01:18:21 1994 d13 11 @