1 files changed, 40 insertions, 35 deletions
diff --git a/contrib/less/funcs.h b/contrib/less/funcs.h
index 11605acc8b3b..903087785b0b 100644
--- a/contrib/less/funcs.h
+++ b/contrib/less/funcs.h
@@ -8,17 +8,18 @@ public size_t sprefix(constant char *ps, constant char *s, int uppercase);
 public void quit(int status);
 public int secure_allow(int features);
 public void raw_mode(int on);
+public void scrsize(void);
 public void screen_size_changed(void);
 public constant char * special_key_str(int key);
 public void init_win_colors(void);
-public void get_term(void);
+public void get_term();
 public void init_mouse(void);
 public void deinit_mouse(void);
 public void suspend_screen(void);
 public void resume_screen(void);
-public void init(void);
-public void deinit(void);
-public int interactive(void);
+public void term_init(void);
+public void term_deinit(void);
+public lbool interactive(void);
 public void home(void);
 public void dump_screen(void);
 public void add_line(void);
@@ -29,8 +30,8 @@ public void line_left(void);
 public void check_winch(void);
 public void goto_line(int sindex);
 public void vbell(void);
-public void bell(void);
-public void clear(void);
+public void lbell(void);
+public void lclear(void);
 public void clear_eol(void);
 public void clear_bot(void);
 public void init_bracketed_paste(void);
@@ -45,7 +46,7 @@ public void putbs(void);
 public void WIN32ungetch(int ch);
 public lbool win32_kbhit2(lbool no_queued);
 public lbool win32_kbhit(void);
-public char WIN32getch(void);
+public int WIN32getch(void);
 public void win32_getch_clear(void);
 public void WIN32setcolors(int fg, int bg);
 public void WIN32textout(constant char *text, size_t len);
@@ -106,7 +107,7 @@ public constant char * cmd_lastpattern(void);
 public void init_cmdhist(void);
 public void save_cmdhist(void);
 public void cmd_exec(void);
-public int in_mca(void);
+public lbool in_mca(void);
 public int norm_search_type(int st);
 public void screen_trashed_num(int trashed);
 public void screen_trashed(void);
@@ -134,6 +135,7 @@ public void add_uvar_table(unsigned char *buf, size_t len);
 public void add_sysvar_table(unsigned char *buf, size_t len);
 public int fcmd_decode(constant char *cmd, constant char **sp);
 public int ecmd_decode(constant char *cmd, constant char **sp);
+public lbool parse_csl(lbool (*func)(constant char *word, size_t wlen, void *arg), constant char *str, void *arg);
 public constant char * lgetenv(constant char *var);
 public constant char * lgetenv_ext(constant char *var, unsigned char *env_buf, size_t env_buf_len);
 public lbool isnullenv(constant char *s);
@@ -142,8 +144,8 @@ public int lesskey_src(constant char *filename, lbool sysvar);
 public int lesskey_content(constant char *content, lbool sysvar);
 public int editchar(char c, int flags);
 public void init_textlist(struct textlist *tlist, mutable char *str);
-public constant char * forw_textlist(struct textlist *tlist, constant char *prev);
-public constant char * back_textlist(struct textlist *tlist, constant char *prev);
+public constant char * forw_textlist(constant struct textlist *tlist, constant char *prev);
+public constant char * back_textlist(constant struct textlist *tlist, constant char *prev);
 public void close_altpipe(IFILE ifile);
 public void check_altpipe_error(void);
 public int edit(constant char *filename);
@@ -170,7 +172,7 @@ public char * dirfile(constant char *dirname, constant char *filename, int must_
 public char * homefile(constant char *filename);
 public char * fexpand(constant char *s);
 public char * fcomplete(constant char *s);
-public int bin_file(int f, ssize_t *n);
+public lbool bin_file(int f, ssize_t *n);
 public char * readfd(FILE *fd);
 public char * lglob(constant char *afilename);
 public lbool is_fake_pathname(constant char *path);
@@ -188,8 +190,8 @@ public lbool eof_displayed(lbool offset);
 public lbool entire_file_displayed(void);
 public void squish_check(void);
 public int overlay_header(void);
-public void forw(int n, POSITION pos, lbool force, lbool only_last, lbool to_newline, int nblank);
-public void back(int n, POSITION pos, lbool force, lbool only_last, lbool to_newline);
+public void forw(int n, POSITION pos, lbool force, lbool only_last, lbool to_newline, lbool do_stop_on_form_feed, int nblank);
+public void back(int n, POSITION pos, lbool force, lbool only_last, lbool to_newline, lbool do_stop_on_form_feed);
 public void forward(int n, lbool force, lbool only_last, lbool to_newline);
 public void backward(int n, lbool force, lbool only_last, lbool to_newline);
 public int get_back_scroll(void);
@@ -203,10 +205,10 @@ public IFILE get_ifile(constant char *filename, IFILE prev);
 public constant char * get_filename(IFILE ifile);
 public constant char * get_real_filename(IFILE ifile);
 public int get_index(IFILE ifile);
-public void store_pos(IFILE ifile, struct scrpos *scrpos);
+public void store_pos(IFILE ifile, constant struct scrpos *scrpos);
 public void get_pos(IFILE ifile, struct scrpos *scrpos);
 public void set_open(IFILE ifile);
-public int opened(IFILE ifile);
+public lbool opened(IFILE ifile);
 public void hold_ifile(IFILE ifile, int incr);
 public int held_ifile(IFILE ifile);
 public void * get_filestate(IFILE ifile);
@@ -264,6 +266,7 @@ public POSITION forw_raw_line(POSITION curr_pos, constant char **linep, size_t *
 public POSITION back_raw_line(POSITION curr_pos, constant char **linep, size_t *line_lenp);
 public int skip_columns(int cols, constant char **linep, size_t *line_lenp);
 public void load_line(constant char *str);
+public int longest_line_width(void);
 public int rrshift(void);
 public int set_color_map(int attr, constant char *colorstr);
 public constant char * get_color_map(int attr);
@@ -278,7 +281,7 @@ public void lsystem(constant char *cmd, constant char *donemsg);
 public int pipe_mark(char c, constant char *cmd);
 public int pipe_data(constant char *cmd, POSITION spos, POSITION epos);
 public void init_mark(void);
-public int badmark(char c);
+public lbool badmark(char c);
 public void setmark(char c, int where);
 public void clrmark(char c);
 public void lastmark(void);
@@ -303,6 +306,7 @@ public void opt_t(int type, constant char *s);
 public void opt__T(int type, constant char *s);
 public void opt_p(int type, constant char *s);
 public void opt__P(int type, constant char *s);
+public void opt_autosave(int type, constant char *s);
 public void opt_b(int type, constant char *s);
 public void opt_i(int type, constant char *s);
 public void opt__V(int type, constant char *s);
@@ -321,7 +325,6 @@ public void opt_status_col_width(int type, constant char *s);
 public void opt_filesize(int type, constant char *s);
 public void opt_first_cmd_at_prompt(int type, constant char *s);
 public void opt_intr(int type, constant char *s);
-public int next_cnum(constant char **sp, constant char *printopt, constant char *errmsg, lbool *errp);
 public void opt_header(int type, constant char *s);
 public void opt_search_type(int type, constant char *s);
 public void opt_nosearch_headers(int type, constant char *s);
@@ -331,17 +334,18 @@ public void opt_no_paste(int type, constant char *s);
 public void opt_ttyin_name(int type, constant char *s);
 public int chop_line(void);
 public int get_swindow(void);
+public lbool autosave_action(char act);
 public constant char * propt(char c);
 public void scan_option(constant char *s, lbool is_env);
-public void toggle_option(struct loption *o, lbool lower, constant char *s, int how_toggle);
-public int opt_has_param(struct loption *o);
-public constant char * opt_prompt(struct loption *o);
+public lbool toggle_option(struct loption *o, lbool lower, constant char *s, int how_toggle);
+public lbool opt_has_param(constant struct loption *o);
+public constant char * opt_prompt(constant struct loption *o);
 public constant char * opt_toggle_disallowed(int c);
 public lbool isoptpending(void);
 public void nopendopt(void);
-public int getnumc(constant char **sp, constant char *printopt, lbool *errp);
-public int getnum(char **sp, constant char *printopt, lbool *errp);
-public long getfraction(constant char **sp, constant char *printopt, lbool *errp);
+public lbool getnumc(constant char **sp, constant char *printopt, lbool neg_ok, mutable int *p_num);
+public lbool getnum(char **sp, constant char *printopt, lbool neg_ok, mutable int *p_num);
+public lbool getfraction(constant char **sp, mutable long *p_frac);
 public void init_unsupport(void);
 public int get_quit_at_eof(void);
 public void init_option(void);
@@ -350,10 +354,11 @@ public struct loption * findopt_name(constant char **p_optname, constant char **
 public char * findopts_name(constant char *pfx);
 public void init_poll(void);
 public lbool ttyin_ready(void);
-public int supports_ctrl_x(void);
+public lbool supports_ctrl_x(void);
 public ssize_t iread(int fd, unsigned char *buf, size_t len);
 public int iopen(constant char *filename, int flags);
 public void intio(void);
+public void polling_ok(void);
 public time_type get_time(void);
 public char * errno_message(constant char *filename);
 public constant char * signal_message(int sig);
@@ -364,16 +369,16 @@ public int os9_signal(int type, RETSIGTYPE (*handler)());
 public void sleep_ms(int ms);
 public void put_line(lbool forw_scroll);
 public void flush(void);
-public void set_output(int fd);
+public void set_output(int fd, lbool no_term_init);
 public int putchr(int ch);
 public void clear_bot_if_needed(void);
 public void putstr(constant char *s);
-public int less_printf(constant char *fmt, PARG *parg);
+public int less_printf(constant char *fmt, constant PARG *parg);
 public void get_return(void);
-public void error(constant char *fmt, PARG *parg);
-public void ierror(constant char *fmt, PARG *parg);
-public void ixerror(constant char *fmt, PARG *parg);
-public int query(constant char *fmt, PARG *parg);
+public void error(constant char *fmt, constant PARG *parg);
+public void ierror(constant char *fmt, constant PARG *parg);
+public void ixerror(constant char *fmt, constant PARG *parg);
+public int query(constant char *fmt, constant PARG *parg);
 public int compile_pattern(constant char *pattern, int search_type, int show_error, PATTERN_TYPE *comp_pattern);
 public void uncompile_pattern(PATTERN_TYPE *pattern);
 public int valid_pattern(char *pattern);
@@ -386,8 +391,8 @@ public void add_back_pos(POSITION pos);
 public void pos_clear(void);
 public void pos_init(void);
 public int onscreen(POSITION pos);
-public int empty_screen(void);
-public int empty_lines(int s, int e);
+public lbool empty_screen(void);
+public lbool empty_lines(int s, int e);
 public void get_scrpos(struct scrpos *scrpos, int where);
 public int sindex_from_sline(int sline);
 public void pos_rehead(void);
@@ -401,7 +406,7 @@ public int get_cvt_ops(int search_type);
 public void repaint_hilite(lbool on);
 public void clear_attn(void);
 public void undo_search(lbool clear);
-public void undo_osc8(void);
+public lbool undo_osc8(void);
 public void clr_hlist(struct hilite_tree *anchor);
 public void clr_hilite(void);
 public void clr_filter(void);
@@ -420,7 +425,7 @@ public int search(int search_type, constant char *pattern, int n);
 public void prep_hilite(POSITION spos, POSITION epos, int maxlines);
 public void set_filter_pattern(constant char *pattern, int search_type);
 public lbool is_filtering(void);
-public RETSIGTYPE winch(int type);
+public RETSIGTYPE lwinch(int type);
 public void init_signals(int on);
 public void psignals(void);
 public void cleantags(void);
@@ -445,7 +450,7 @@ public void xbuf_deinit(struct xbuffer *xbuf);
 public void xbuf_reset(struct xbuffer *xbuf);
 public void xbuf_add_byte(struct xbuffer *xbuf, unsigned char b);
 public void xbuf_add_char(struct xbuffer *xbuf, char c);
-public void xbuf_add_data(struct xbuffer *xbuf, constant unsigned char *data, size_t len);
+public void xbuf_add_data(struct xbuffer *xbuf, constant void *vdata, size_t len);
 public int xbuf_pop(struct xbuffer *buf);
 public void xbuf_set(struct xbuffer *dst, constant struct xbuffer *src);
 public constant char * xbuf_char_data(constant struct xbuffer *xbuf);