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.58 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.56 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.54 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.52 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.50 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.48 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.46 pkgsrc-2011Q1-base:1.1 pkgsrc-2010Q4:1.1.0.44 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.42 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.40 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.38 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.36 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.34 pkgsrc-2009Q3-base:1.1 pkgsrc-2009Q2:1.1.0.32 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.30 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.28 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.26 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.24 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.22 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.20 pkgsrc-2008Q1:1.1.0.18 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.0.16 pkgsrc-2007Q4-base:1.1 pkgsrc-2007Q3:1.1.0.14 pkgsrc-2007Q3-base:1.1 pkgsrc-2007Q2:1.1.0.12 pkgsrc-2007Q2-base:1.1 pkgsrc-2007Q1:1.1.0.10 pkgsrc-2007Q1-base:1.1 pkgsrc-2006Q4:1.1.0.8 pkgsrc-2006Q4-base:1.1 pkgsrc-2006Q3:1.1.0.6 pkgsrc-2006Q3-base:1.1 pkgsrc-2006Q2:1.1.0.4 pkgsrc-2006Q2-base:1.1 pkgsrc-2006Q1:1.1.0.2 pkgsrc-2006Q1-base: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 2006.01.05.19.27.50; author joerg; 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-ad,v 1.1 2006/01/05 19:27:50 joerg Exp $ - don't declare own errno - use some const - don't declare own fopen() - do declare own functions - use C89 --- te_defs.h.orig 1993-08-05 22:29:33.000000000 +0000 +++ te_defs.h @@@@ -387,7 +387,6 @@@@ extern struct outfiledata po_file, so_fi extern int char_count; /* char count for tab typer */ extern char lastc; /* last char read */ extern int ttyerr; /* error return from ioctl */ -extern int errno; /* system error code */ #ifdef POSIX_TECO extern struct termios ttybuf; /* local copy of tty control data */ #else @@@@ -429,20 +428,16 @@@@ extern struct buffcell *insert_p; /* po extern int buff_mod; /* set to earliest buffer change */ extern int search_flag; /* set nonzero by search */ -extern char *errors[]; /* error text */ +extern const char *errors[]; /* error text */ extern char mapch[], mapch_l[]; /* char mapping tables */ extern char spec_chars[]; /* special character table */ -extern char skipto(), find_endcond(), getcmdc(), getcmdc0(); /* routines that return chars */ extern FILE *eisw; /* indirect command file pointer */ -extern FILE *fopen(); extern struct buffcell *freebuff; /* buffcell free-list pointer */ extern struct buffcell *dly_freebuff; /* delayed free-list pointer */ extern struct is *freedcell; /* cell free-list pointer */ -extern struct buffcell *get_bcell(); /* get buffcell routine */ -extern struct is *get_dcell(); /* get data cell routine */ /* the text buffer header */ extern struct qh buff; @@@@ -466,3 +461,96 @@@@ extern struct exp_entry *esp; /* expres /* the directory string buffer */ extern struct qh dir_name; + +/* te_utils.c */ +struct buffcell *get_bcell(void); /* get buffcell routine */ +VOID free_blist(struct buffcell *p); +VOID dly_free_blist(struct buffcell *p); +VOID free_dlyd_blist(struct buffcell *p); +VOID reset_q_usecounts(void); +extern struct is *get_dcell(void); /* get data cell routine */ +VOID make_buffer(struct qh *p); +int fwdc(struct qp *arg); +int fwdcx(struct qp *arg); +int backc(struct qp *arg); +VOID set_pointer(int pos, struct qp *ptr); +char getcmdc0(int trace); +char getcmdc(int trace); +int peekcmdc(char arg); + +/* te_subs.c */ +VOID movenchars(struct qp *from, struct qp *to, register int n); +VOID moveuntil(struct qp *form, struct qp *to, register char c, + int *n, int max, int trace); +int get_value(int d); +int lines(register int arg); +int line_args(int d, struct qp *p); +int getqspec(int fors, char c); +VOID insert1(void); +VOID insert2(int count); +VOID delete1(int nchars); +char skipto(int arg); +VOID do_ctlp(void); + +/* te_main.c */ +VOID cleanup(void); +VOID update_header(void); +VOID init_wd(void); +VOID get_term_par(void); +VOID do_o(void); + +/* te_rdcmd.c */ +int read_cmdstr(void); +VOID retype_cmdstr(char c); + +/* te_exec0.c */ +VOID exec_cmdstr(void); + +/* te_exec1.c */ +VOID exec_cmds1(void); + +/* te_exec2.c */ +VOID do_e(void); +int do_eq(void); +int do_eq1(char *shell); +int do_en(void); +int do_glob(struct qh *gbuff, struct qh *sbuff); +VOID do_en_next(void); +int read_filename(int flag, char func); +VOID set_var(int extend, int *arg); +int read_file(struct qp *rbuff, int *nchars, int endsw); +VOID write_file(struct qp *wbuff, int nchars, int ffsw); +VOID kill_output(struct outfiledata *outptr); +VOID panic(void); +VOID do_f(void); +VOID pop_iteration(int arg); +VOID find_enditer(void); +VOID find_endcond(char arg); + +/* te_srch.c */ +int build_string(struct qh *sbuff); +int end_search(int result); +int setup_search(void); +int do_nsearch(char arg); +int do_fb(void); +int do_search(int count); + +/* te_chario.c */ +VOID setup_tty(int arg); +int gettty_nowait(void); +int gettty(void); +void block_inter(int func); +VOID crlf(void); +VOID reset_ctlo(void); +VOID type_char(char c); + +/* te_window.c */ +VOID vt(int func); +VOID do_window(int ref_flag); +VOID set_term_par(int lines, int cols); +VOID window(int arg); +VOID scroll_dly(void); +VOID display_lines(void); + +/* te_fxstub.c */ +void te_fx(void); @ 1.1 log @Fix errno. @ text @d1 1 a1 1 $NetBSD$ d3 7 a9 1 --- te_defs.h.orig 2006-01-04 20:59:21.000000000 +0000 d19 119 @