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.0.56 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.54 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.52 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.50 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.48 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.46 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.44 pkgsrc-2011Q1-base:1.1 pkgsrc-2010Q4:1.1.0.42 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.40 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.38 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.36 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.34 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.32 pkgsrc-2009Q3-base:1.1 pkgsrc-2009Q2:1.1.0.30 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.28 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.26 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.24 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.22 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.20 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.18 pkgsrc-2008Q1:1.1.0.16 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.0.14 pkgsrc-2007Q4-base:1.1 pkgsrc-2007Q3:1.1.0.12 pkgsrc-2007Q3-base:1.1 pkgsrc-2007Q2:1.1.0.10 pkgsrc-2007Q2-base:1.1 pkgsrc-2007Q1:1.1.0.8 pkgsrc-2007Q1-base:1.1 pkgsrc-2006Q4:1.1.0.6 pkgsrc-2006Q4-base:1.1 pkgsrc-2006Q3:1.1.0.4 pkgsrc-2006Q3-base:1.1 pkgsrc-2006Q2:1.1.0.2 pkgsrc-2006Q2-base:1.1; locks; strict; comment @# @; 1.2 date 2012.12.28.03.03.08; author dholland; state Exp; branches; next 1.1; 1.1 date 2006.06.08.16.15.47; author minskim; state Exp; branches; next ; desc @@ 1.2 log @Fix legacy C. Pass -Wall -W -Wmissing-declarations -Wwrite-strings on gcc45. - avoid implicit int, declare void functions void - return values from non-void functions - put most external declarations properly in header files - use some static and const - fix up a big mess with function pointer casting - use standard includes, don't provide own decls of standard functions - use types matching libc when providing own malloc, printf, and putchar - use functions correctly - silence assorted compiler warnings - fix some bugs exposed by compiler warnings - don't intentionally exercise signed overflow - remove some unused items - add patch comments to other patch (patch-aa) As this includes several fixes and removes some undefined behavior on a commonly reachable code path, bump PKGREVISION. @ text @$NetBSD$ - teach it about dead functions - use const for string constants - use speed_t for tty speed - don't declare versionstring, which is static in ex_version.c - fix up function pointer casting mess --- ex.h.orig 2012-12-27 21:58:42.000000000 +0000 +++ ex.h @@@@ -238,6 +238,15 @@@@ typedef int woid; #endif /* !__STDC__ */ /* + * nonreturning functions + */ +#if defined(__GNUC__) || defined(__CLANG__) +#define dead __attribute__((__noreturn__)) +#else +#define dead +#endif + +/* * Use reliable POSIX.1 signals if available. */ #ifdef POSIX_1 @@@@ -401,8 +410,8 @@@@ typedef jmp_buf JMP_BUF; * ex_data.c... see the shell script "makeoptions". */ struct option { - char *oname; - char *oabbrev; + const char *oname; + const char *oabbrev; short otype; /* Types -- see below */ short odefault; /* Default value */ short ovalue; /* Current value */ @@@@ -483,7 +492,7 @@@@ var bool aiflag; /* Append/change/inser var bool anymarks; /* We have used '[a-z] */ var int bsize; /* Block size for disk i/o */ var int chng; /* Warn "No write" */ -var char *Command; +var const char *Command; var short defwind; /* -w# change default window size */ var int dirtcnt; /* When >= MAXDIRT, should sync temporary */ #ifdef TIOCLGET @@@@ -504,11 +513,11 @@@@ var char file[FNSIZE]; /* Working file n var bool fixedzero; /* zero file size was fixed (for visual) */ var char genbuf[MAXBSIZE]; /* Working buffer when manipulating linebuf */ var bool hush; /* Command line option - was given, hush up! */ -var char *globp; /* (Untyped) input string to command mode */ +var const char *globp; /* (Untyped) input string to command mode */ var bool holdcm; /* Don't cursor address */ var bool inappend; /* in ex command append mode */ var bool inglobal; /* Inside g//... or v//... */ -var char *initev; /* Initial : escape for visual */ +var const char *initev; /* Initial : escape for visual */ var bool inopen; /* Inside open or visual */ var char *input; /* Current position in cmd line input buffer */ var bool intty; /* Input is a tty */ @@@@ -530,7 +539,11 @@@@ var shand oldquit; /* Previous SIGQUIT h var shand oldxfsz; /* Previous SIGXFSZ handler */ #endif var short oprompt; /* Saved during source */ +#ifdef POSIX_1 +extern speed_t ospeed; /* Output speed (from gtty) */ +#else extern short ospeed; /* Output speed (from gtty) */ +#endif var int otchng; /* Backup tchng to find changes in macros */ var short peekc; /* Peek ahead character (cmd mode input) */ var char *pkill[2]; /* Trim for put with ragged (LISP) delete */ @@@@ -549,7 +562,6 @@@@ extern int tfile; /* Temporary file uni var bool tflag; /* -t option given on command line */ var bool vcatch; /* Want to catch an error (open/visual) */ var bool verbose; /* -V option; print command input to stderr */ -var char *versionstring; /* For the "version" command */ var JMP_BUF vreslab; /* For error throws to a visual catch */ var bool writing; /* 1 if in middle of a file write */ var int xchng; /* Suppresses multiple "No writes" in !cmd */ @@@@ -639,9 +651,9 @@@@ var line *undadot; /* If we saved all li #define UNDNONE 3 #define UNDPUT 4 -extern int (*Outchar)(); -extern int (*Pline)(); -extern int (*Putchar)(); +extern int (*Outchar)(int); +extern int (*Pline)(int); +extern int (*Putchar)(int); #define NOSTR (char *) 0 #define NOLINE (line *) 0 @@@@ -663,6 +675,6 @@@@ var nl_catd catd; #else /* !LANGMSG */ #define catgets(a, b, c, d) (d) #endif /* !LANGMSG */ -var char *cntrlhm; +var const char *cntrlhm; #include "ex_proto.h" @ 1.1 log @Make this package build with gcc-4. @ text @d3 7 a9 1 --- ex.h.orig 2003-03-18 20:29:07.000000000 +0000 d11 63 a73 1 @@@@ -549,7 +549,6 @@@@ extern int tfile; /* Temporary file uni d81 21 @