head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.108 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.106 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.104 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.102 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.100 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.98 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.96 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.94 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.92 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.90 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.88 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.86 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.84 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.82 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.80 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.78 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.76 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.74 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.72 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.70 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.68 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.66 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.64 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.60 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.40 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.62 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.58 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.56 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.54 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.52 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.50 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.48 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.46 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.44 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.42 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.38 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.36 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.34 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.32 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.30 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.28 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.26 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.24 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.22 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.20 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.18 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.16 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.14 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.12 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.10 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.8 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.6 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.4 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.2 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.1.1.1.0.58 pkgsrc-2012Q3-base:1.1.1.1 pkgsrc-2012Q2:1.1.1.1.0.56 pkgsrc-2012Q2-base:1.1.1.1 pkgsrc-2012Q1:1.1.1.1.0.54 pkgsrc-2012Q1-base:1.1.1.1 pkgsrc-2011Q4:1.1.1.1.0.52 pkgsrc-2011Q4-base:1.1.1.1 pkgsrc-2011Q3:1.1.1.1.0.50 pkgsrc-2011Q3-base:1.1.1.1 pkgsrc-2011Q2:1.1.1.1.0.48 pkgsrc-2011Q2-base:1.1.1.1 pkgsrc-2011Q1:1.1.1.1.0.46 pkgsrc-2011Q1-base:1.1.1.1 pkgsrc-2010Q4:1.1.1.1.0.44 pkgsrc-2010Q4-base:1.1.1.1 pkgsrc-2010Q3:1.1.1.1.0.42 pkgsrc-2010Q3-base:1.1.1.1 pkgsrc-2010Q2:1.1.1.1.0.40 pkgsrc-2010Q2-base:1.1.1.1 pkgsrc-2010Q1:1.1.1.1.0.38 pkgsrc-2010Q1-base:1.1.1.1 pkgsrc-2009Q4:1.1.1.1.0.36 pkgsrc-2009Q4-base:1.1.1.1 pkgsrc-2009Q3:1.1.1.1.0.34 pkgsrc-2009Q3-base:1.1.1.1 pkgsrc-2009Q2:1.1.1.1.0.32 pkgsrc-2009Q2-base:1.1.1.1 pkgsrc-2009Q1:1.1.1.1.0.30 pkgsrc-2009Q1-base:1.1.1.1 pkgsrc-2008Q4:1.1.1.1.0.28 pkgsrc-2008Q4-base:1.1.1.1 pkgsrc-2008Q3:1.1.1.1.0.26 pkgsrc-2008Q3-base:1.1.1.1 cube-native-xorg:1.1.1.1.0.24 cube-native-xorg-base:1.1.1.1 pkgsrc-2008Q2:1.1.1.1.0.22 pkgsrc-2008Q2-base:1.1.1.1 cwrapper:1.1.1.1.0.20 pkgsrc-2008Q1:1.1.1.1.0.18 pkgsrc-2008Q1-base:1.1.1.1 pkgsrc-2007Q4:1.1.1.1.0.16 pkgsrc-2007Q4-base:1.1.1.1 pkgsrc-2007Q3:1.1.1.1.0.14 pkgsrc-2007Q3-base:1.1.1.1 pkgsrc-2007Q2:1.1.1.1.0.12 pkgsrc-2007Q2-base:1.1.1.1 pkgsrc-2007Q1:1.1.1.1.0.10 pkgsrc-2007Q1-base:1.1.1.1 pkgsrc-2006Q4:1.1.1.1.0.8 pkgsrc-2006Q4-base:1.1.1.1 pkgsrc-2006Q3:1.1.1.1.0.6 pkgsrc-2006Q3-base:1.1.1.1 pkgsrc-2006Q2:1.1.1.1.0.4 pkgsrc-2006Q2-base:1.1.1.1 pkgsrc-2006Q1:1.1.1.1.0.2 pkgsrc-2006Q1-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.2 date 2012.12.27.06.13.20; author dholland; state Exp; branches; next 1.1; 1.1 date 2005.12.28.22.29.17; author is; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2005.12.28.22.29.17; author is; state Exp; branches; next ; desc @@ 1.2 log @Clean up legacy C. Now passes gcc -Wall -Wextra -Wmissing-declarations -Wwrite-strings on gcc45. May build with clang now too. Changes: - use standard headers - don't declare own errno, fopen(), getenv(), or malloc() - declare own functions - declare void functions void - avoid implicit int - use C89 - use some const - use some static - fix signed/unsigned mismatches - call execl() properly - don't cast return value of malloc - initialize struct sigaction correctly - use functions correctly - don't index arrays with (signed) char - don't put function declarations inside function bodies - patch up two uninitialized variables - silence some compiler warnings that are not bugs - remove some unused objects and: - add patch comments for preexisting patches - correct some minor pkglint As a couple of these things fixed bugs (e.g. the execl calls), bump PKGREVISION. @ text @$NetBSD: patch-ac,v 1.1.1.1 2005/12/28 22:29:17 is Exp $ - use some static - don't put function declarations inside function bodies - remove unused goto-label - call ctype.h functions correctly - don't index arrays with (signed) char - remove silly code that provokes a pointer width warning - declare void functions void - remove unused variable --- te_rdcmd.c.orig 1993-08-05 22:29:35.000000000 +0000 +++ te_rdcmd.c @@@@ -9,13 +9,15 @@@@ #include "te_defs.h" +static unsigned short do_func_keys(unsigned short c); +static int find_lasteol(void); + int ccount; /* count of chars read in */ int read_cmdstr() { unsigned short c; /* temporary character */ int i; /* temporary */ - unsigned short do_func_keys(); goto prompt; @@@@ -30,7 +32,7 @@@@ int read_cmdstr() ccount = 0; lastc = ' '; -reline: /* continue reading */ +/*reline:*/ /* continue reading */ for (;;) /* loop to read command string chars */ { if (!eisw && !inp_noterm) /* if terminal input */ @@@@ -106,7 +108,7 @@@@ reline: /* continue reading */ i = (c == '~') ? NEXTQREGS/2 : 0; type_char(c = gettty()); /* read & echo one more */ if (isdigit(c)) i += EXTQREGS + c - '0'; - else if (isalpha(mapch_l[c])) i += EXTQREGS + 10 + c - 'a'; + else if (isalpha((unsigned char)mapch_l[c])) i += EXTQREGS + 10 + c - 'a'; else ERROR(E_IQN); } else i = getqspec(0, c); @@@@ -119,7 +121,8 @@@@ reline: /* continue reading */ qreg[i].f->usecount = 1; } qreg[i].z = cbuf.z; - cbuf.f = (struct buffcell *) (cbuf.z = 0); /* no old command string */ + cbuf.z = 0; + cbuf.f = NULL; /* no old command string */ err = 0; /* no previous error */ goto restart; } @@@@ -238,7 +241,7 @@@@ reline: /* continue reading */ /* back up to find most recent CR or LF in entered command string */ /* return number of chars backed up */ -int find_lasteol() +static int find_lasteol(void) { int i; @@@@ -258,7 +261,7 @@@@ int find_lasteol() /* retype command string: entirely (arg = '*') or most recent line (arg = ' ') */ -retype_cmdstr(c) +VOID retype_cmdstr(c) char c; { int i; @@@@ -294,7 +297,7 @@@@ static struct qp saved_cmd_ptr; static unsigned short do_func_keys(c) unsigned short c; { - unsigned short i, n; /* temporaries */ + unsigned short n; /* temporaries */ struct qh *header_p; /* pointer to register's header */ struct qp pointer; /* q-pointer to register being copied */ unsigned char last_c = ' ', this_c; /* char's used in copying command string */ @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ d3 10 a12 1 --- te_rdcmd.c.orig 1993-08-06 00:29:35.000000000 +0200 d14 1 a14 1 @@@@ -9,13 +9,14 @@@@ d18 2 a19 1 +static unsigned short do_func_keys(); d31 55 @ 1.1.1.1 log @Mark C. Henderson's port of Matt Fichtenbaums TECO for Ultrix. @ text @@