head 1.3; access; symbols pkgsrc-2021Q1:1.2.0.138 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.136 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.134 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.130 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.110 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.132 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.128 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.126 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.124 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.122 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.120 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.118 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.116 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.114 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.112 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.108 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.106 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.104 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.102 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.100 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.98 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.96 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.94 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.92 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.90 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.88 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.86 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.84 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.82 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.80 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.78 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.76 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.74 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.72 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.70 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.68 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.66 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.64 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.62 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.60 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.58 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.56 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.54 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.52 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.50 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.48 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.46 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.44 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.42 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.40 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.38 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.36 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.34 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.32 pkgsrc-2008Q1:1.2.0.30 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.28 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.26 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.24 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.22 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.20 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.18 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.16 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.14 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.12 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.10 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.8 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.6 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.4 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.2 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.1.1.1.0.14 pkgsrc-2004Q2-base:1.1.1.1 pkgsrc-2004Q1:1.1.1.1.0.12 pkgsrc-2004Q1-base:1.1.1.1 pkgsrc-2003Q4:1.1.1.1.0.10 pkgsrc-2003Q4-base:1.1.1.1 netbsd-1-6-1:1.1.1.1.0.6 netbsd-1-6-1-base:1.1.1.1 netbsd-1-6:1.1.1.1.0.8 netbsd-1-6-RELEASE-base:1.1.1.1 pkgviews:1.1.1.1.0.4 pkgviews-base:1.1.1.1 buildlink2:1.1.1.1.0.2 buildlink2-base:1.1.1.1 netbsd-1-5-PATCH003:1.1.1.1 netbsd-1-5-PATCH001:1.1.1.1 netbsd-1-5-RELEASE:1.1.1.1 netbsd-1-4-PATCH003:1.1.1.1 netbsd-1-4-PATCH002:1.1.1.1 comdex-fall-1999:1.1.1.1 netbsd-1-4-PATCH001:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.3 date 2021.04.13.15.15.46; author nia; state dead; branches; next 1.2; commitid 2AJ7UMqOvShZ09PC; 1.2 date 2004.09.08.14.30.00; author markd; state Exp; branches; next 1.1; 1.1 date 99.06.18.19.18.18; author jlam; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 99.06.18.19.18.18; author jlam; state Exp; branches; next ; desc @@ 1.3 log @remove security/srp_client development appears stalled upstream and this does not support current openssl or SSP. @ text @$NetBSD: patch-ac,v 1.2 2004/09/08 14:30:00 markd Exp $ Rename setmode (and clearmode for consistency) to avoid clash with unistd.h. --- telnet/telnet/commands.c.orig 1998-12-11 11:50:48.000000000 +1300 +++ telnet/telnet/commands.c @@@@ -64,11 +64,12 @@@@ static char sccsid[] = "@@(#)commands.c 8 #include #endif /* CRAY */ +#include /* vfork() */ #include #include #include #include -#include +#include #include #include @@@@ -110,7 +111,8 @@@@ extern int isprefix(); extern char **genget(); extern int Ambiguous(); -static call(); +typedef int (*intrtn_t) __P((int, char *[])); +static call(intrtn_t, ...); typedef struct { char *name; /* command name */ @@@@ -1156,13 +1158,13 @@@@ dolmmode(bit, on) } int -setmode(bit) +setlmode(bit) { return dolmmode(bit, 1); } int -clearmode(bit) +clearlmode(bit) { return dolmmode(bit, 0); } @@@@ -1188,18 +1190,18 @@@@ static struct modelist ModeList[] = { #endif { "", "", 0 }, { "", "These require the LINEMODE option to be enabled", 0 }, - { "isig", "Enable signal trapping", setmode, 1, MODE_TRAPSIG }, - { "+isig", 0, setmode, 1, MODE_TRAPSIG }, - { "-isig", "Disable signal trapping", clearmode, 1, MODE_TRAPSIG }, - { "edit", "Enable character editing", setmode, 1, MODE_EDIT }, - { "+edit", 0, setmode, 1, MODE_EDIT }, - { "-edit", "Disable character editing", clearmode, 1, MODE_EDIT }, - { "softtabs", "Enable tab expansion", setmode, 1, MODE_SOFT_TAB }, - { "+softtabs", 0, setmode, 1, MODE_SOFT_TAB }, - { "-softtabs", "Disable character editing", clearmode, 1, MODE_SOFT_TAB }, - { "litecho", "Enable literal character echo", setmode, 1, MODE_LIT_ECHO }, - { "+litecho", 0, setmode, 1, MODE_LIT_ECHO }, - { "-litecho", "Disable literal character echo", clearmode, 1, MODE_LIT_ECHO }, + { "isig", "Enable signal trapping", setlmode, 1, MODE_TRAPSIG }, + { "+isig", 0, setlmode, 1, MODE_TRAPSIG }, + { "-isig", "Disable signal trapping", clearlmode, 1, MODE_TRAPSIG }, + { "edit", "Enable character editing", setlmode, 1, MODE_EDIT }, + { "+edit", 0, setlmode, 1, MODE_EDIT }, + { "-edit", "Disable character editing", clearlmode, 1, MODE_EDIT }, + { "softtabs", "Enable tab expansion", setlmode, 1, MODE_SOFT_TAB }, + { "+softtabs", 0, setlmode, 1, MODE_SOFT_TAB }, + { "-softtabs", "Disable character editing", clearlmode, 1, MODE_SOFT_TAB }, + { "litecho", "Enable literal character echo", setlmode, 1, MODE_LIT_ECHO }, + { "+litecho", 0, setlmode, 1, MODE_LIT_ECHO }, + { "-litecho", "Disable literal character echo", clearlmode, 1, MODE_LIT_ECHO }, { "help", 0, modehelp, 0 }, #ifdef KLUDGELINEMODE { "kludgeline", 0, dokludgemode, 1 }, @@@@ -2607,19 +2609,14 @@@@ static Command cmdtab2[] = { * Call routine with argc, argv set from args (terminated by 0). */ - /*VARARGS1*/ - static -call(va_alist) - va_dcl +static int +call(intrtn_t routine, ...) { va_list ap; - typedef int (*intrtn_t)(); - intrtn_t routine; char *args[100]; int argno = 0; - va_start(ap); - routine = (va_arg(ap, intrtn_t)); + va_start(ap, routine); while ((args[argno++] = va_arg(ap, char *)) != 0) { ; } @ 1.2 log @varargs -> stdarg Don't try and use getutent() on NetBSD's that have utmpx Fixes problems seen in bulkbuild. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.1.1.1 1999/06/18 19:18:18 jlam Exp $ @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ d5 3 a7 3 --- telnet/telnet/commands.c.orig Thu Dec 10 17:50:48 1998 +++ telnet/telnet/commands.c Fri Jun 18 06:59:32 1999 @@@@ -64,6 +64,7 @@@@ d15 17 a31 1 @@@@ -1156,13 +1157,13 @@@@ d47 1 a47 1 @@@@ -1188,18 +1189,18 @@@@ d78 23 @ 1.1.1.1 log @srp-1.4.4 -- client programs using Secure Remote Password protocol @ text @@