head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.168 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.166 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.164 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.162 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.160 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.158 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.156 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.154 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.152 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.150 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.148 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.146 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.144 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.142 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.140 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.138 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.136 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.134 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.132 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.130 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.128 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.126 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.124 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.120 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.100 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.122 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.118 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.116 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.114 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.112 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.110 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.108 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.106 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.104 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.102 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.98 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.96 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.94 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.92 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.90 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.88 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.86 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.84 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.82 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.80 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.78 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.76 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.74 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.72 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.70 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.68 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.66 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.64 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.62 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.60 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.58 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.56 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.54 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.52 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.50 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.48 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.46 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.44 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.42 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.40 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.38 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.36 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.34 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.32 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.30 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.28 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.26 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.24 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.22 pkgsrc-2008Q1:1.2.0.20 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.18 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.16 pkgsrc-2007Q3-base:1.2 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.16 pkgsrc-2005Q3-base:1.1 pkgsrc-2005Q2:1.1.0.14 pkgsrc-2005Q2-base:1.1 pkgsrc-2005Q1:1.1.0.12 pkgsrc-2005Q1-base:1.1 pkgsrc-2004Q4:1.1.0.10 pkgsrc-2004Q4-base:1.1 pkgsrc-2004Q3:1.1.0.8 pkgsrc-2004Q3-base:1.1 pkgsrc-2004Q2:1.1.0.6 pkgsrc-2004Q2-base:1.1 pkgsrc-2004Q1:1.1.0.4 pkgsrc-2004Q1-base:1.1 pkgsrc-2003Q4:1.1.0.2 pkgsrc-2003Q4-base:1.1; locks; strict; comment @# @; 1.2 date 2005.12.09.15.26.52; author joerg; state Exp; branches; next 1.1; 1.1 date 2003.09.22.20.22.37; author tron; state Exp; branches; next ; desc @@ 1.2 log @Remove malloc prototype, add ereply prototype. This fixes prototype signature errors from GCC 3.4+. @ text @$NetBSD$ --- echo.c.orig 1988-07-03 17:50:08.000000000 +0000 +++ echo.c @@@@ -6,23 +6,15 @@@@ * of the display screen. Used by the entire * known universe. */ -/* - * The varargs lint directive comments are 0 an attempt to get lint to shup - * up about CORRECT usage of varargs.h. It won't. - */ #include "def.h" #include "key.h" -#ifdef LOCAL_VARARGS -#include "varargs.h" -#else -#include -#endif +#include #ifndef NO_MACRO # include "macro.h" #endif static int veread(); -VOID ewprintf(); +VOID ewprintf(char *, ...); static VOID eformat(); static VOID eputi(); static VOID eputl(); @@@@ -30,6 +22,9 @@@@ static VOID eputs(); static VOID eputc(); static int complt(); +int ereply(char *, char *, int, ...); + + int epresf = FALSE; /* Stuff in echo line flag. */ /* * Erase the echo line. @@@@ -111,20 +106,13 @@@@ eyesno(sp) char *sp; { * place. This is always a new message, there is no auto * completion, and the return is echoed as such. */ -/*VARARGS 0*/ -ereply(va_alist) -va_dcl +ereply(char *fp, char *buf, int nbuf, ...) { va_list pvar; - register char *fp, *buf; - register int nbuf; register int i; - va_start(pvar); - fp = va_arg(pvar, char *); - buf = va_arg(pvar, char *); - nbuf = va_arg(pvar, int); - i = veread(fp, buf, nbuf, EFNEW|EFCR, &pvar); + va_start(pvar, nbuf); + i = veread(fp, buf, nbuf, EFNEW|EFCR, pvar); va_end(pvar); return i; } @@@@ -138,24 +126,18 @@@@ va_dcl * new prompt), an EFFUNC (autocomplete), or EFCR (echo * the carriage return as CR). */ -/* VARARGS 0 */ -eread(va_alist) -va_dcl +eread(char *fp, char *buf, int nbuf, int flag, ...) { va_list pvar; - char *fp, *buf; - int nbuf, flag, i; - va_start(pvar); - fp = va_arg(pvar, char *); - buf = va_arg(pvar, char *); - nbuf = va_arg(pvar, int); - flag = va_arg(pvar, int); - i = veread(fp, buf, nbuf, flag, &pvar); + int i; + + va_start(pvar, flag); + i = veread(fp, buf, nbuf, flag, pvar); va_end(pvar); return i; } -static veread(fp, buf, nbuf, flag, ap) char *fp; char *buf; va_list *ap; { +static veread(fp, buf, nbuf, flag, ap) char *fp; char *buf; va_list ap; { register int cpos; register int i; register int c; @@@@ -425,22 +407,18 @@@@ getxtra(lp1, lp2, cpos, wflag) register * echo line. The formatting is done by a call * to the standard formatting routine. */ -/*VARARGS 0 */ VOID -ewprintf(va_alist) -va_dcl +ewprintf(char *fp, ...) { va_list pvar; - register char *fp; #ifndef NO_MACRO if(inmacro) return; #endif - va_start(pvar); - fp = va_arg(pvar, char *); + va_start(pvar, fp); ttcolor(CTEXT); ttmove(nrow-1, 0); - eformat(fp, &pvar); + eformat(fp, pvar); va_end(pvar); tteeol(); ttflush(); @@@@ -459,7 +437,7 @@@@ va_dcl static VOID eformat(fp, ap) register char *fp; -register va_list *ap; +va_list ap; { register int c; char kname[NKNAME]; @@@@ -473,7 +451,7 @@@@ register va_list *ap; c = *fp++; switch (c) { case 'c': - (VOID) keyname(kname, va_arg(*ap, int)); + (VOID) keyname(kname, va_arg(ap, int)); eputs(kname); break; @@@@ -488,22 +466,22 @@@@ register va_list *ap; break; case 'd': - eputi(va_arg(*ap, int), 10); + eputi(va_arg(ap, int), 10); break; case 'o': - eputi(va_arg(*ap, int), 8); + eputi(va_arg(ap, int), 8); break; case 's': - eputs(va_arg(*ap, char *)); + eputs(va_arg(ap, char *)); break; case 'l':/* explicit longword */ c = *fp++; switch(c) { case 'd': - eputl((long)va_arg(*ap, long), 10); + eputl((long)va_arg(ap, long), 10); break; default: eputc(c); @ 1.1 log @Rewrite to use "stdarg.h" instead of "varargs.h" to fix build problem with GCC 3.3.1. @ text @d3 2 a4 2 --- echo.c.orig 1988-07-03 19:50:08.000000000 +0200 +++ echo.c 2003-09-22 22:20:46.000000000 +0200 d31 11 a41 1 @@@@ -111,20 +103,13 @@@@ d65 1 a65 1 @@@@ -138,24 +123,18 @@@@ d96 1 a96 1 @@@@ -425,22 +404,18 @@@@ d122 1 a122 1 @@@@ -459,7 +434,7 @@@@ d131 1 a131 1 @@@@ -473,7 +448,7 @@@@ d140 1 a140 1 @@@@ -488,22 +463,22 @@@@ @