===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/less/funcs.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- src/usr.bin/less/funcs.h	2014/05/10 16:45:23	1.8
+++ src/usr.bin/less/funcs.h	2015/11/05 22:08:44	1.9
@@ -1,293 +1,290 @@
-	public char * save ();
-	public VOID_POINTER ecalloc ();
-	public char * skipsp ();
-	public int sprefix ();
-	public void quit ();
-	public void raw_mode ();
-	public void scrsize ();
-	public char * special_key_str ();
-	public void get_term ();
-	public void init ();
-	public void deinit ();
-	public void home ();
-	public void add_line ();
-	public void remove_top ();
-	public void win32_scroll_up ();
-	public void lower_left ();
-	public void line_left ();
-	public void check_winch ();
-	public void goto_line ();
-	public void vbell ();
-	public void bell ();
-	public void clear ();
-	public void clear_eol ();
-	public void clear_bot ();
-	public void at_enter ();
-	public void at_exit ();
-	public void at_switch ();
-	public int is_at_equiv ();
-	public int apply_at_specials ();
-	public void backspace ();
-	public void putbs ();
-	public char WIN32getch ();
-	public void WIN32setcolors ();
-	public void WIN32textout ();
-	public void match_brac ();
-	public void ch_ungetchar ();
-	public void end_logfile ();
-	public void sync_logfile ();
-	public int ch_seek ();
-	public int ch_end_seek ();
-	public int ch_beg_seek ();
-	public POSITION ch_length ();
-	public POSITION ch_tell ();
-	public int ch_forw_get ();
-	public int ch_back_get ();
-	public void ch_setbufspace ();
-	public void ch_flush ();
-	public int seekable ();
-	public void ch_set_eof ();
-	public void ch_init ();
-	public void ch_close ();
-	public int ch_getflags ();
-	public void ch_dump ();
-	public void init_charset ();
-	public int binary_char ();
-	public int control_char ();
-	public char * prchar ();
-	public char * prutfchar ();
-	public int utf_len ();
-	public int is_utf8_well_formed ();
-	public LWCHAR get_wchar ();
-	public void put_wchar ();
-	public LWCHAR step_char ();
-	public int is_composing_char ();
-	public int is_ubin_char ();
-	public int is_wide_char ();
-	public int is_combining_char ();
-	public void cmd_reset ();
-	public void clear_cmd ();
-	public void cmd_putstr ();
-	public int len_cmdbuf ();
-	public void set_mlist ();
-	public void cmd_addhist ();
-	public void cmd_accept ();
-	public int cmd_char ();
-	public LINENUM cmd_int ();
-	public char * get_cmdbuf ();
-	public char * cmd_lastpattern ();
-	public void init_cmdhist ();
-	public void save_cmdhist ();
-	public int in_mca ();
-	public void dispversion ();
-	public int getcc ();
-	public void ungetcc ();
-	public void ungetsc ();
-	public void commands ();
-	public int cvt_length ();
-	public int * cvt_alloc_chpos ();
-	public void cvt_text ();
-	public void init_cmds ();
-	public void add_fcmd_table ();
-	public void add_ecmd_table ();
-	public int fcmd_decode ();
-	public int ecmd_decode ();
-	public char * lgetenv ();
-	public int lesskey ();
-	public void add_hometable ();
-	public int editchar ();
-	public void init_textlist ();
-	public char * forw_textlist ();
-	public char * back_textlist ();
-	public int edit ();
-	public int edit_ifile ();
-	public int edit_list ();
-	public int edit_first ();
-	public int edit_last ();
-	public int edit_next ();
-	public int edit_prev ();
-	public int edit_index ();
-	public IFILE save_curr_ifile ();
-	public void unsave_ifile ();
-	public void reedit_ifile ();
-	public void reopen_curr_ifile ();
-	public int edit_stdin ();
-	public void cat_file ();
-	public void use_logfile ();
-	public char * shell_unquote ();
-	public char * get_meta_escape ();
-	public char * shell_quote ();
-	public char * homefile ();
-	public char * fexpand ();
-	public char * fcomplete ();
-	public int bin_file ();
-	public char * lglob ();
-	public char * open_altfile ();
-	public void close_altfile ();
-	public int is_dir ();
-	public char * bad_file ();
-	public POSITION filesize ();
-	public char * shell_coption ();
-	public char * last_component ();
-	public int eof_displayed ();
-	public int entire_file_displayed ();
-	public void squish_check ();
-	public void forw ();
-	public void back ();
-	public void forward ();
-	public void backward ();
-	public int get_back_scroll ();
-	public void del_ifile ();
-	public IFILE next_ifile ();
-	public IFILE prev_ifile ();
-	public IFILE getoff_ifile ();
-	public int nifile ();
-	public IFILE get_ifile ();
-	public char * get_filename ();
-	public int get_index ();
-	public void store_pos ();
-	public void get_pos ();
-	public void set_open ();
-	public int opened ();
-	public void hold_ifile ();
-	public int held_ifile ();
-	public void * get_filestate ();
-	public void set_filestate ();
-	public void if_dump ();
-	public POSITION forw_line ();
-	public POSITION back_line ();
-	public void set_attnpos ();
-	public void jump_forw ();
-	public void jump_back ();
-	public void repaint ();
-	public void jump_percent ();
-	public void jump_line_loc ();
-	public void jump_loc ();
-	public void init_line ();
-	public int is_ascii_char ();
-	public void prewind ();
-	public void plinenum ();
-	public void pshift_all ();
-	public int is_ansi_end ();
-	public int is_ansi_middle ();
-	public int pappend ();
-	public int pflushmbc ();
-	public void pdone ();
-	public void set_status_col ();
-	public int gline ();
-	public void null_line ();
-	public POSITION forw_raw_line ();
-	public POSITION back_raw_line ();
-	public void clr_linenum ();
-	public void add_lnum ();
-	public LINENUM find_linenum ();
-	public POSITION find_pos ();
-	public LINENUM currline ();
-	public void lsystem ();
-	public int pipe_mark ();
-	public int pipe_data ();
-	public void init_mark ();
-	public int badmark ();
-	public void setmark ();
-	public void lastmark ();
-	public void gomark ();
-	public POSITION markpos ();
-	public void unmark ();
-	public void opt_o ();
-	public void opt__O ();
-	public void opt_j ();
-	public void calc_jump_sline ();
-	public void opt_shift ();
-	public void calc_shift_count ();
-	public void opt_k ();
-	public void opt_t ();
-	public void opt__T ();
-	public void opt_p ();
-	public void opt__P ();
-	public void opt_b ();
-	public void opt_i ();
-	public void opt__V ();
-	public void opt_D ();
-	public void opt_x ();
-	public void opt_quote ();
-	public void opt_query ();
-	public int get_swindow ();
-	public char * propt ();
-	public void scan_option ();
-	public void toggle_option ();
-	public int opt_has_param ();
-	public char * opt_prompt ();
-	public int isoptpending ();
-	public void nopendopt ();
-	public int getnum ();
-	public long getfraction ();
-	public int get_quit_at_eof ();
-	public void init_option ();
-	public struct loption * findopt ();
-	public struct loption * findopt_name ();
-	public int iread ();
-	public long get_time ();
-	public char * errno_message ();
-	public int percentage ();
-	public POSITION percent_pos ();
-	public int  os9_signal ();
-	public void put_line ();
-	public void flush ();
-	public int putchr ();
-	public void putstr ();
-	public void get_return ();
-	public void error ();
-	public void ierror ();
-	public int query ();
-	public int compile_pattern ();
-	public void uncompile_pattern ();
-	public int is_null_pattern ();
-	public int match_pattern ();
-	public POSITION position ();
-	public void add_forw_pos ();
-	public void add_back_pos ();
-	public void pos_clear ();
-	public void pos_init ();
-	public int onscreen ();
-	public int empty_screen ();
-	public int empty_lines ();
-	public void get_scrpos ();
-	public int adjsline ();
-	public void init_prompt ();
-	public char * pr_expand ();
-	public char * eq_message ();
-	public char * pr_string ();
-	public char * wait_message ();
-	public void init_search ();
-	public void repaint_hilite ();
-	public void clear_attn ();
-	public void undo_search ();
-	public void clr_hlist ();
-	public void clr_hilite ();
-	public void clr_filter ();
-	public int is_filtered ();
-	public int is_hilited ();
-	public void chg_caseless ();
-	public void chg_hilite ();
-	public int search ();
-	public void prep_hilite ();
-	public void set_filter_pattern ();
-	public int is_filtering ();
-	public RETSIGTYPE winch ();
-	public RETSIGTYPE winch ();
-	public void init_signals ();
-	public void psignals ();
-	public void cleantags ();
-	public int gettagtype ();
-	public void findtag ();
-	public POSITION tagsearch ();
-	public char * nexttag ();
-	public char * prevtag ();
-	public int ntags ();
-	public int curr_tag ();
-	public int edit_tagfile ();
-	public void open_getchr ();
-	public void close_getchr ();
-	public int getchr ();
-	public void (*lsignal()) ();
-	public char * helpfile ();
+/*
+ * Copyright 2014 Garrett D'Amore <garrett@damore.org>
+ *
+ * This file is made available under the terms of the Less License.
+ */
+
+#include <regex.h>
+
+struct mlist;
+struct loption;
+
+extern char *save(const char *);
+extern void *ecalloc(int, unsigned int);
+/*PRINTFLIKE1*/
+extern char *easprintf(const char *, ...);
+extern char *estrdup(const char *);
+extern char *skipsp(char *);
+extern int sprefix(char *, char *, int);
+extern void quit(int);
+extern void raw_mode(int);
+extern	char *special_key_str(int);
+extern	void get_term(void);
+extern	void init(void);
+extern	void deinit(void);
+extern	void home(void);
+extern	void add_line(void);
+extern	void lower_left(void);
+extern	void line_left(void);
+extern	void goto_line(int);
+extern	void vbell(void);
+extern	void ring_bell(void);
+extern	void do_clear(void);
+extern	void clear_eol(void);
+extern	void clear_bot(void);
+extern	void at_enter(int);
+extern	void at_exit(void);
+extern	void at_switch(int);
+extern	int is_at_equiv(int, int);
+extern	int apply_at_specials(int);
+extern	void putbs(void);
+extern	void match_brac(int, int, int, int);
+extern	void ch_ungetchar(int);
+extern	void end_logfile(void);
+extern	void sync_logfile(void);
+extern	int ch_seek(off_t);
+extern	int ch_end_seek(void);
+extern	int ch_beg_seek(void);
+extern	off_t ch_length(void);
+extern	off_t ch_tell(void);
+extern	int ch_forw_get(void);
+extern	int ch_back_get(void);
+extern	void ch_setbufspace(int);
+extern	void ch_flush(void);
+extern	int seekable(int);
+extern	void ch_set_eof(void);
+extern	void ch_init(int, int);
+extern	void ch_close(void);
+extern	int ch_getflags(void);
+extern	void init_charset(void);
+extern	int binary_char(LWCHAR);
+extern	int control_char(LWCHAR);
+extern	char *prchar(LWCHAR);
+extern	char *prutfchar(LWCHAR);
+extern	int utf_len(char);
+extern	int is_utf8_well_formed(const char *);
+extern	LWCHAR get_wchar(const char *);
+extern	void put_wchar(char **, LWCHAR);
+extern	LWCHAR step_char(char **, int, char *);
+extern	int is_composing_char(LWCHAR);
+extern	int is_ubin_char(LWCHAR);
+extern	int is_wide_char(LWCHAR);
+extern	int is_combining_char(LWCHAR, LWCHAR);
+extern	void cmd_reset(void);
+extern	void clear_cmd(void);
+extern	void cmd_putstr(char *);
+extern	int len_cmdbuf(void);
+extern	void set_mlist(void *, int);
+extern	void cmd_addhist(struct mlist *, const char *);
+extern	void cmd_accept(void);
+extern	int cmd_char(int);
+extern	LINENUM cmd_int(long *);
+extern	char *get_cmdbuf(void);
+extern	char *cmd_lastpattern(void);
+extern	void init_cmdhist(void);
+extern	void save_cmdhist(void);
+extern	int in_mca(void);
+extern	void dispversion(void);
+extern	int getcc(void);
+extern	void ungetcc(int);
+extern	void ungetsc(char *);
+extern	void commands(void);
+extern	int cvt_length(int);
+extern	int *cvt_alloc_chpos(int);
+extern	void cvt_text(char *, char *, int *, int *, int);
+extern	void init_cmds(void);
+extern	void add_fcmd_table(char *, int);
+extern	void add_ecmd_table(char *, int);
+extern	int fcmd_decode(const char *, char **);
+extern	int ecmd_decode(const char *, char **);
+extern	char *lgetenv(char *);
+extern	int lesskey(char *, int);
+extern	void add_hometable(char *, char *, int);
+extern	int editchar(int, int);
+extern	void init_textlist(struct textlist *, char *);
+extern	char *forw_textlist(struct textlist *, char *);
+extern	char *back_textlist(struct textlist *, char *);
+extern	int edit(char *);
+extern	int edit_ifile(IFILE);
+extern	int edit_list(char *);
+extern	int edit_first(void);
+extern	int edit_last(void);
+extern	int edit_next(int);
+extern	int edit_prev(int);
+extern	int edit_index(int);
+extern	IFILE save_curr_ifile(void);
+extern	void unsave_ifile(IFILE);
+extern	void reedit_ifile(IFILE);
+extern	void reopen_curr_ifile(void);
+extern	int edit_stdin(void);
+extern	void cat_file(void);
+extern	void use_logfile(char *);
+extern	char *shell_unquote(char *);
+extern	char *get_meta_escape(void);
+extern	char *shell_quote(const char *);
+extern	char *homefile(char *);
+extern	char *fexpand(char *);
+extern	char *fcomplete(char *);
+extern	int bin_file(int f);
+extern	char *lglob(char *);
+extern	char *open_altfile(char *, int *, void **);
+extern	void close_altfile(char *, char *, void *);
+extern	int is_dir(char *);
+extern	char *bad_file(char *);
+extern	off_t filesize(int);
+extern	char *last_component(char *);
+extern	int eof_displayed(void);
+extern	int entire_file_displayed(void);
+extern	void squish_check(void);
+extern	void forw(int, off_t, int, int, int);
+extern	void back(int, off_t, int, int);
+extern	void forward(int, int, int);
+extern	void backward(int, int, int);
+extern	int get_back_scroll(void);
+extern	void del_ifile(IFILE);
+extern	IFILE next_ifile(IFILE);
+extern	IFILE prev_ifile(IFILE);
+extern	IFILE getoff_ifile(IFILE);
+extern	int nifile(void);
+extern	IFILE get_ifile(char *, IFILE);
+extern	char *get_filename(IFILE);
+extern	int get_index(IFILE);
+extern	void store_pos(IFILE, struct scrpos *);
+extern	void get_pos(IFILE, struct scrpos *);
+extern	int opened(IFILE);
+extern	void hold_ifile(IFILE, int);
+extern	int held_ifile(IFILE);
+extern	void set_open(IFILE);
+extern	void *get_filestate(IFILE);
+extern	void set_filestate(IFILE, void *);
+extern	off_t forw_line(off_t);
+extern	off_t back_line(off_t);
+extern	void set_attnpos(off_t);
+extern	void jump_forw(void);
+extern	void jump_back(LINENUM);
+extern	void repaint(void);
+extern	void jump_percent(int, long);
+extern	void jump_line_loc(off_t, int);
+extern	void jump_loc(off_t, int);
+extern	void init_line(void);
+extern	int is_ascii_char(LWCHAR);
+extern	void prewind(void);
+extern	void plinenum(LINENUM);
+extern	void pshift_all(void);
+extern	int is_ansi_end(LWCHAR);
+extern	int is_ansi_middle(LWCHAR);
+extern	int pappend(char, off_t);
+extern	int pflushmbc(void);
+extern	void pdone(int, int);
+extern	void set_status_col(char);
+extern	int gline(int, int *);
+extern	void null_line(void);
+extern	off_t forw_raw_line(off_t, char **, int *);
+extern	off_t back_raw_line(off_t, char **, int *);
+extern	void clr_linenum(void);
+extern	void add_lnum(LINENUM, off_t);
+extern	LINENUM find_linenum(off_t);
+extern	off_t find_pos(LINENUM);
+extern	LINENUM currline(int);
+extern	void lsystem(const char *, const char *);
+extern	int pipe_mark(int, char *);
+extern	void init_mark(void);
+extern	int badmark(int);
+extern	void setmark(int);
+extern	void lastmark(void);
+extern	void gomark(int);
+extern	off_t markpos(int);
+extern	void unmark(IFILE);
+extern	void opt_o(int, char *);
+extern	void opt__O(int, char *);
+extern	void opt_j(int, char *);
+extern	void calc_jump_sline(void);
+extern	void opt_shift(int, char *);
+extern	void calc_shift_count(void);
+extern	void opt_k(int, char *);
+extern	void opt_t(int, char *);
+extern	void opt__T(int, char *);
+extern	void opt_p(int, char *);
+extern	void opt__P(int, char *);
+extern	void opt_b(int, char *);
+extern	void opt_i(int, char *);
+extern	void opt__V(int, char *);
+extern	void opt_x(int, char *);
+extern	void opt_quote(int, char *);
+extern	void opt_query(int, char *);
+extern	int get_swindow(void);
+extern	char *propt(int);
+extern	void scan_option(char *);
+extern	void toggle_option(struct loption *, int, char *, int);
+extern	int opt_has_param(struct loption *);
+extern	char *opt_prompt(struct loption *);
+extern	int isoptpending(void);
+extern	void nopendopt(void);
+extern	int getnum(char **, char *, int *);
+extern	long getfraction(char **, char *, int *);
+extern	int get_quit_at_eof(void);
+extern	void init_option(void);
+extern	struct loption *findopt(int);
+extern	struct loption *findopt_name(char **, char **, int *);
+extern	int iread(int, unsigned char *, unsigned int);
+extern	long get_time(void);
+extern	char *errno_message(char *);
+extern	int percentage(off_t, off_t);
+extern	off_t percent_pos(off_t, int, long);
+extern	void put_line(void);
+extern	void flush(void);
+extern	int putchr(int);
+extern	void putstr(const char *);
+extern	void get_return(void);
+extern	void error(const char *, PARG *);
+extern	void ierror(const char *, PARG *);
+extern	int query(const char *, PARG *);
+extern	int compile_pattern(char *, int, regex_t **);
+extern	void uncompile_pattern(regex_t **);
+extern	int is_null_pattern(void *);
+extern	int match_pattern(void *, char *, char *, int, char **, char **,
+    int, int);
+extern	off_t position(int);
+extern	void add_forw_pos(off_t);
+extern	void add_back_pos(off_t);
+extern	void pos_clear(void);
+extern	void pos_init(void);
+extern	int onscreen(off_t);
+extern	int empty_screen(void);
+extern	int empty_lines(int, int);
+extern	void get_scrpos(struct scrpos *);
+extern	int adjsline(int);
+extern	void init_prompt(void);
+extern	char *pr_expand(const char *, int);
+extern	char *eq_message(void);
+extern	char *prompt_string(void);
+extern	char *wait_message(void);
+extern	void init_search(void);
+extern	void repaint_hilite(int);
+extern	void clear_attn(void);
+extern	void undo_search(void);
+extern	void clr_hilite(void);
+extern	int is_filtered(off_t);
+extern	int is_hilited(off_t, off_t, int, int *);
+extern	void chg_caseless(void);
+extern	void chg_hilite(void);
+extern	int search(int, char *, int);
+extern	void prep_hilite(off_t, off_t, int);
+extern	void set_filter_pattern(char *, int);
+extern	int is_filtering(void);
+extern	void sigwinch(int);
+extern	void init_signals(int);
+extern	void psignals(void);
+extern	void cleantags(void);
+extern	void findtag(char *);
+extern	off_t tagsearch(void);
+extern	char *nexttag(int);
+extern	char *prevtag(int);
+extern	int ntags(void);
+extern	int curr_tag(void);
+extern	int edit_tagfile(void);
+extern	void open_getchr(void);
+extern	void close_getchr(void);
+extern	int getchr(void);
+extern	void *lsignal(int, void (*)(int));
+extern	char *helpfile(void);