git: 6680e5a52f8a - main - import nvi 2.2.0-3bbdfe4
Baptiste Daroussin
bapt at FreeBSD.org
Fri May 21 20:51:46 UTC 2021
The branch main has been updated by bapt:
URL: https://cgit.FreeBSD.org/src/commit/?id=6680e5a52f8abf059bbbd3e0be66d9dce476cdf9
commit 6680e5a52f8abf059bbbd3e0be66d9dce476cdf9
Merge: f190f9193bc1 8e6e1224184e
Author: Baptiste Daroussin <bapt at FreeBSD.org>
AuthorDate: 2021-05-21 20:50:50 +0000
Commit: Baptiste Daroussin <bapt at FreeBSD.org>
CommitDate: 2021-05-21 20:51:21 +0000
import nvi 2.2.0-3bbdfe4
contrib/nvi/.gitignore | 5 +
contrib/nvi/CMakeLists.txt | 38 +-
contrib/nvi/cl/cl.h | 3 -
contrib/nvi/cl/cl_read.c | 4 +-
contrib/nvi/cl/extern.h | 31 --
contrib/nvi/common/common.h | 6 +-
contrib/nvi/common/conv.h | 2 +-
contrib/nvi/common/exf.c | 27 ++
contrib/nvi/common/extern.h | 131 -------
contrib/nvi/common/key.h | 6 +-
contrib/nvi/common/options.h | 4 +
contrib/nvi/common/recover.c | 12 +
contrib/nvi/ex/ex.c | 3 +-
contrib/nvi/ex/ex_cscope.c | 14 +
contrib/nvi/ex/extern.h | 131 -------
contrib/nvi/man/vi.1 | 50 ++-
contrib/nvi/vi/extern.h | 145 --------
contrib/nvi/vi/v_increment.c | 4 +-
contrib/nvi/vi/vs_line.c | 2 +-
usr.bin/vi/Makefile | 5 +-
usr.bin/vi/config.h | 9 +
{contrib/nvi => usr.bin/vi}/ex/version.h | 2 +
{contrib/nvi/ex => usr.bin/vi}/ex_def.h | 0
usr.bin/vi/extern.h | 444 +++++++++++++++++++++++
{contrib/nvi/common => usr.bin/vi}/options_def.h | 0
25 files changed, 607 insertions(+), 471 deletions(-)
diff --cc contrib/nvi/.gitignore
index aac7860d7299,000000000000..2b79229e57e0
mode 100644,000000..100644
--- a/contrib/nvi/.gitignore
+++ b/contrib/nvi/.gitignore
@@@ -1,9 -1,0 +1,14 @@@
+*.swp
+*~
+*.orig
+*.core
+extern.h
+*_def.h
+version.h
+tags
+build/
++
++# Ignore files by the GNU Global source code tagging system.
++/GPATH
++/GRTAGS
++/GTAGS
diff --cc usr.bin/vi/Makefile
index 993970fd3051,000000000000..5769a34c6d2e
mode 100644,000000..100644
--- a/usr.bin/vi/Makefile
+++ b/usr.bin/vi/Makefile
@@@ -1,76 -1,0 +1,77 @@@
+#
+# $FreeBSD$
+#
+
+.include <src.opts.mk>
+
+PACKAGE= vi
+SRCDIR= ${SRCTOP}/contrib/nvi
+SUBDIR+= catalog
+
+WARNS?= 0 # some warn issues on 32 bit machines
+
+VI= nvi
+EX= nex
+VIEW= nview
+
+PROG= nvi
+
- CFLAGS+= -D__REGEX_PRIVATE
++CFLAGS+= -D__REGEX_PRIVATE -D_XOPEN_SOURCE_EXTENDED=1
+
+LINKS= ${BINDIR}/${VI} ${BINDIR}/${EX} ${BINDIR}/${VI} ${BINDIR}/${VIEW}
+LINKS+= ${BINDIR}/${VI} ${BINDIR}/vi ${BINDIR}/${EX} ${BINDIR}/ex
+LINKS+= ${BINDIR}/${VI} ${BINDIR}/view
+
+MAN= ${SRCDIR}/man/vi.1
+MLINKS+=vi.1 ex.1 vi.1 view.1
+MLINKS+=vi.1 nex.1 vi.1 nview.1 vi.1 nvi.1
+
+.PATH: ${SRCDIR}/common
+.PATH: ${SRCDIR}/ex
+.PATH: ${SRCDIR}/cl
+.PATH: ${SRCDIR}/vi
+.PATH: ${SRCDIR}/regex
+
- CFLAGS+=-I${.CURDIR} -I${SRCDIR} -I${SRCDIR}/regex
++CFLAGS+=-I${.CURDIR} -I${SRCDIR} -I${SRCDIR}/regex \
++ -I${.CURDIR}/ex
+
+LIBADD= util ncursesw
+
+.if ${MK_ICONV} == "yes" && !defined(RESCUE)
+CFLAGS+= -DUSE_ICONV -DICONV_TRADITIONAL
+.endif
+
+CLEANFILES+=${EX}
+
+# Vi curses sources
+SRCS+= cl_funcs.c cl_main.c cl_read.c cl_screen.c cl_term.c
+
+# General sources.
+SRCS+= conv.c cut.c delete.c encoding.c exf.c key.c line.c log.c main.c mark.c msg.c options.c \
+ options_f.c put.c recover.c screen.c search.c seq.c util.c
+
+# Ex source.
+SRCS+= ex.c ex_abbrev.c ex_append.c ex_args.c ex_argv.c ex_at.c ex_bang.c \
+ ex_cd.c ex_cmd.c ex_cscope.c ex_delete.c ex_display.c \
+ ex_edit.c ex_equal.c ex_file.c ex_filter.c ex_global.c \
+ ex_init.c ex_join.c ex_map.c ex_mark.c ex_mkexrc.c ex_move.c \
+ ex_open.c ex_preserve.c ex_print.c ex_put.c ex_quit.c \
+ ex_read.c ex_screen.c ex_script.c ex_set.c ex_shell.c \
+ ex_shift.c ex_source.c ex_stop.c ex_subst.c ex_tag.c \
+ ex_txt.c ex_undo.c ex_usage.c ex_util.c ex_version.c ex_visual.c \
+ ex_write.c ex_yank.c ex_z.c
+
+# Vi source.
+SRCS+= getc.c v_at.c v_ch.c v_cmd.c v_delete.c v_ex.c v_increment.c v_init.c \
+ v_itxt.c v_left.c v_mark.c v_match.c v_paragraph.c v_put.c v_redraw.c \
+ v_replace.c v_right.c v_screen.c v_scroll.c v_search.c v_section.c \
+ v_sentence.c v_status.c v_txt.c v_ulcase.c v_undo.c \
+ v_util.c v_word.c v_xchar.c v_yank.c v_z.c v_zexit.c vi.c
+
+# Vi screen source.
+SRCS+= vs_line.c vs_msg.c vs_refresh.c vs_relative.c vs_smap.c vs_split.c
+
+# Wide char regex
+SRCS+= regcomp.c regerror.c regexec.c regfree.c
+
+.include <bsd.prog.mk>
diff --cc usr.bin/vi/config.h
index 85ffb2874b34,000000000000..2b4348870db4
mode 100644,000000..100644
--- a/usr.bin/vi/config.h
+++ b/usr.bin/vi/config.h
@@@ -1,19 -1,0 +1,28 @@@
+/* $FreeBSD$ */
+
+/* Define when using wide characters */
+#define USE_WIDECHAR
+
+/* Define when iconv can be used */
+/* #undef USE_ICONV */
+
+/* Define when the 2nd argument of iconv(3) is not const */
+/* #undef ICONV_TRADITIONAL */
+
+/* Define if you have <libutil.h> */
+#define HAVE_LIBUTIL_H
+
+/* Define if you have <ncurses.h> */
+#define HAVE_NCURSES_H
+
++/* Define if you have <ncursesw/ncurses.h> */
++/* #undef HAVE_NCURSESW_NCURSES_H */
++
++/* Define if you have <pty.h> */
++/* #undef HAVE_PTY_H */
++
+/* Define if you have <term.h> */
+#define HAVE_TERM_H
++
++/* Define if struct dirent has field d_namlen */
++#define HAVE_DIRENT_D_NAMLEN
diff --cc usr.bin/vi/ex/version.h
index 742b145ebd3f,000000000000..f14fc879222e
mode 100644,000000..100644
--- a/usr.bin/vi/ex/version.h
+++ b/usr.bin/vi/ex/version.h
@@@ -1,1 -1,0 +1,3 @@@
++/* $FreeBSD$ */
++
+#define VI_VERSION "2.2.0 (2020-08-01)"
diff --cc usr.bin/vi/ex_def.h
index 7afb7b19d677,000000000000..7afb7b19d677
mode 100644,000000..100644
--- a/usr.bin/vi/ex_def.h
+++ b/usr.bin/vi/ex_def.h
diff --cc usr.bin/vi/extern.h
index 000000000000,000000000000..1252726d9d8b
new file mode 100644
--- /dev/null
+++ b/usr.bin/vi/extern.h
@@@ -1,0 -1,0 +1,444 @@@
++#ifdef CL_IN_EX /* cl.h */
++int cl_waddstr(SCR *, const CHAR_T *, size_t);
++int cl_addstr(SCR *, const char *, size_t);
++int cl_attr(SCR *, scr_attr_t, int);
++int cl_baud(SCR *, u_long *);
++int cl_bell(SCR *);
++int cl_clrtoeol(SCR *);
++int cl_cursor(SCR *, size_t *, size_t *);
++int cl_deleteln(SCR *);
++int cl_discard(SCR *, SCR **);
++int cl_ex_adjust(SCR *, exadj_t);
++int cl_insertln(SCR *);
++int cl_keyval(SCR *, scr_keyval_t, CHAR_T *, int *);
++int cl_move(SCR *, size_t, size_t);
++int cl_refresh(SCR *, int);
++int cl_rename(SCR *, char *, int);
++void cl_setname(GS *, char *);
++int cl_split(SCR *, SCR *);
++int cl_suspend(SCR *, int *);
++void cl_usage(void);
++int sig_init(GS *, SCR *);
++int cl_event(SCR *, EVENT *, u_int32_t, int);
++int cl_screen(SCR *, u_int32_t);
++int cl_quit(GS *);
++int cl_getcap(SCR *, char *, char **);
++int cl_term_init(SCR *);
++int cl_term_end(GS *);
++int cl_fmap(SCR *, seq_t, CHAR_T *, size_t, CHAR_T *, size_t);
++int cl_optchange(SCR *, int, char *, u_long *);
++int cl_omesg(SCR *, CL_PRIVATE *, int);
++int cl_ssize(SCR *, int, size_t *, size_t *, int *);
++int cl_putchar(int);
++#endif
++#ifdef EXP /* ex.h */
++int ex(SCR **);
++int ex_cmd(SCR *);
++int ex_range(SCR *, EXCMD *, int *);
++int ex_is_abbrev(CHAR_T *, size_t);
++int ex_is_unmap(CHAR_T *, size_t);
++void ex_badaddr
++ (SCR *, EXCMDLIST const *, enum badaddr, enum nresult);
++int ex_abbr(SCR *, EXCMD *);
++int ex_unabbr(SCR *, EXCMD *);
++int ex_append(SCR *, EXCMD *);
++int ex_change(SCR *, EXCMD *);
++int ex_insert(SCR *, EXCMD *);
++int ex_next(SCR *, EXCMD *);
++int ex_prev(SCR *, EXCMD *);
++int ex_rew(SCR *, EXCMD *);
++int ex_args(SCR *, EXCMD *);
++char **ex_buildargv(SCR *, EXCMD *, char *);
++int argv_init(SCR *, EXCMD *);
++int argv_exp0(SCR *, EXCMD *, CHAR_T *, size_t);
++int argv_exp1(SCR *, EXCMD *, CHAR_T *, size_t, int);
++int argv_exp2(SCR *, EXCMD *, CHAR_T *, size_t);
++int argv_exp3(SCR *, EXCMD *, CHAR_T *, size_t);
++int argv_flt_ex(SCR *, EXCMD *, CHAR_T *, size_t);
++int argv_free(SCR *);
++int argv_flt_path(SCR *, EXCMD *, CHAR_T *, size_t);
++CHAR_T *argv_esc(SCR *, EXCMD *, CHAR_T *, size_t);
++CHAR_T *argv_uesc(SCR *, EXCMD *, CHAR_T *, size_t);
++int ex_at(SCR *, EXCMD *);
++int ex_bang(SCR *, EXCMD *);
++int ex_cd(SCR *, EXCMD *);
++int ex_cscope(SCR *, EXCMD *);
++int cscope_end(SCR *);
++int cscope_display(SCR *);
++int cscope_search(SCR *, TAGQ *, TAG *);
++int ex_delete(SCR *, EXCMD *);
++int ex_display(SCR *, EXCMD *);
++int ex_edit(SCR *, EXCMD *);
++int ex_equal(SCR *, EXCMD *);
++int ex_file(SCR *, EXCMD *);
++int ex_filter(SCR *,
++ EXCMD *, MARK *, MARK *, MARK *, CHAR_T *, enum filtertype);
++int ex_global(SCR *, EXCMD *);
++int ex_v(SCR *, EXCMD *);
++int ex_g_insdel(SCR *, lnop_t, recno_t);
++int ex_screen_copy(SCR *, SCR *);
++int ex_screen_end(SCR *);
++int ex_optchange(SCR *, int, char *, u_long *);
++int ex_exrc(SCR *);
++int ex_run_str(SCR *, char *, CHAR_T *, size_t, int, int);
++int ex_join(SCR *, EXCMD *);
++int ex_map(SCR *, EXCMD *);
++int ex_unmap(SCR *, EXCMD *);
++int ex_mark(SCR *, EXCMD *);
++int ex_mkexrc(SCR *, EXCMD *);
++int ex_copy(SCR *, EXCMD *);
++int ex_move(SCR *, EXCMD *);
++int ex_open(SCR *, EXCMD *);
++int ex_preserve(SCR *, EXCMD *);
++int ex_recover(SCR *, EXCMD *);
++int ex_list(SCR *, EXCMD *);
++int ex_number(SCR *, EXCMD *);
++int ex_pr(SCR *, EXCMD *);
++int ex_print(SCR *, EXCMD *, MARK *, MARK *, u_int32_t);
++int ex_ldisplay(SCR *, const CHAR_T *, size_t, size_t, u_int);
++int ex_scprint(SCR *, MARK *, MARK *);
++int ex_printf(SCR *, const char *, ...);
++int ex_puts(SCR *, const char *);
++int ex_fflush(SCR *sp);
++int ex_put(SCR *, EXCMD *);
++int ex_quit(SCR *, EXCMD *);
++int ex_read(SCR *, EXCMD *);
++int ex_readfp(SCR *, char *, FILE *, MARK *, recno_t *, int);
++int ex_bg(SCR *, EXCMD *);
++int ex_fg(SCR *, EXCMD *);
++int ex_resize(SCR *, EXCMD *);
++int ex_sdisplay(SCR *);
++int ex_script(SCR *, EXCMD *);
++int sscr_exec(SCR *, recno_t);
++int sscr_input(SCR *);
++int sscr_end(SCR *);
++int ex_set(SCR *, EXCMD *);
++int ex_shell(SCR *, EXCMD *);
++int ex_exec_proc(SCR *, EXCMD *, char *, const char *, int);
++int proc_wait(SCR *, long, const char *, int, int);
++int ex_shiftl(SCR *, EXCMD *);
++int ex_shiftr(SCR *, EXCMD *);
++int ex_retab(SCR *, EXCMD *);
++int ex_source(SCR *, EXCMD *);
++int ex_stop(SCR *, EXCMD *);
++int ex_s(SCR *, EXCMD *);
++int ex_subagain(SCR *, EXCMD *);
++int ex_subtilde(SCR *, EXCMD *);
++int re_compile(SCR *,
++ CHAR_T *, size_t, CHAR_T **, size_t *, regex_t *, u_int);
++void re_error(SCR *, int, regex_t *);
++int ex_tag_first(SCR *, CHAR_T *);
++int ex_tag_push(SCR *, EXCMD *);
++int ex_tag_next(SCR *, EXCMD *);
++int ex_tag_prev(SCR *, EXCMD *);
++int ex_tag_nswitch(SCR *, TAG *, int);
++int ex_tag_Nswitch(SCR *, TAG *, int);
++int ex_tag_pop(SCR *, EXCMD *);
++int ex_tag_top(SCR *, EXCMD *);
++int ex_tag_display(SCR *);
++int ex_tag_copy(SCR *, SCR *);
++int tagq_free(SCR *, TAGQ *);
++int tagq_push(SCR*, TAGQ*, int, int );
++void tag_msg(SCR *, tagmsg_t, char *);
++int ex_tagf_alloc(SCR *, char *);
++int ex_tag_free(SCR *);
++int ex_txt(SCR *, TEXTH *, ARG_CHAR_T, u_int32_t);
++int ex_undo(SCR *, EXCMD *);
++int ex_help(SCR *, EXCMD *);
++int ex_usage(SCR *, EXCMD *);
++int ex_viusage(SCR *, EXCMD *);
++void ex_cinit(SCR *, EXCMD *, int, int, recno_t, recno_t, int);
++int ex_getline(SCR *, FILE *, size_t *);
++int ex_ncheck(SCR *, int);
++int ex_init(SCR *);
++void ex_wemsg(SCR *, CHAR_T *, exm_t);
++void ex_emsg(SCR *, char *, exm_t);
++int ex_version(SCR *, EXCMD *);
++int ex_visual(SCR *, EXCMD *);
++int ex_wn(SCR *, EXCMD *);
++int ex_wq(SCR *, EXCMD *);
++int ex_write(SCR *, EXCMD *);
++int ex_xit(SCR *, EXCMD *);
++int ex_writefp(SCR *,
++ char *, FILE *, MARK *, MARK *, u_long *, u_long *, int);
++int ex_yank(SCR *, EXCMD *);
++int ex_z(SCR *, EXCMD *);
++#endif
++#ifdef V_ABS /* vi.h */
++int cs_init(SCR *, VCS *);
++int cs_next(SCR *, VCS *);
++int cs_fspace(SCR *, VCS *);
++int cs_fblank(SCR *, VCS *);
++int cs_prev(SCR *, VCS *);
++int cs_bblank(SCR *, VCS *);
++int v_at(SCR *, VICMD *);
++int v_chrepeat(SCR *, VICMD *);
++int v_chrrepeat(SCR *, VICMD *);
++int v_cht(SCR *, VICMD *);
++int v_chf(SCR *, VICMD *);
++int v_chT(SCR *, VICMD *);
++int v_chF(SCR *, VICMD *);
++int v_delete(SCR *, VICMD *);
++int v_again(SCR *, VICMD *);
++int v_exmode(SCR *, VICMD *);
++int v_join(SCR *, VICMD *);
++int v_shiftl(SCR *, VICMD *);
++int v_shiftr(SCR *, VICMD *);
++int v_suspend(SCR *, VICMD *);
++int v_switch(SCR *, VICMD *);
++int v_tagpush(SCR *, VICMD *);
++int v_tagpop(SCR *, VICMD *);
++int v_filter(SCR *, VICMD *);
++int v_ex(SCR *, VICMD *);
++int v_ecl_exec(SCR *);
++int v_increment(SCR *, VICMD *);
++int v_screen_copy(SCR *, SCR *);
++int v_screen_end(SCR *);
++int v_optchange(SCR *, int, char *, u_long *);
++int v_iA(SCR *, VICMD *);
++int v_ia(SCR *, VICMD *);
++int v_iI(SCR *, VICMD *);
++int v_ii(SCR *, VICMD *);
++int v_iO(SCR *, VICMD *);
++int v_io(SCR *, VICMD *);
++int v_change(SCR *, VICMD *);
++int v_Replace(SCR *, VICMD *);
++int v_subst(SCR *, VICMD *);
++int v_left(SCR *, VICMD *);
++int v_cfirst(SCR *, VICMD *);
++int v_first(SCR *, VICMD *);
++int v_ncol(SCR *, VICMD *);
++int v_zero(SCR *, VICMD *);
++int v_mark(SCR *, VICMD *);
++int v_bmark(SCR *, VICMD *);
++int v_fmark(SCR *, VICMD *);
++int v_emark(SCR *, VICMD *);
++int v_match(SCR *, VICMD *);
++int v_buildmcs(SCR *, char *);
++int v_paragraphf(SCR *, VICMD *);
++int v_paragraphb(SCR *, VICMD *);
++int v_buildps(SCR *, char *, char *);
++int v_Put(SCR *, VICMD *);
++int v_put(SCR *, VICMD *);
++int v_redraw(SCR *, VICMD *);
++int v_replace(SCR *, VICMD *);
++int v_right(SCR *, VICMD *);
++int v_dollar(SCR *, VICMD *);
++int v_screen(SCR *, VICMD *);
++int v_lgoto(SCR *, VICMD *);
++int v_home(SCR *, VICMD *);
++int v_middle(SCR *, VICMD *);
++int v_bottom(SCR *, VICMD *);
++int v_up(SCR *, VICMD *);
++int v_cr(SCR *, VICMD *);
++int v_down(SCR *, VICMD *);
++int v_hpageup(SCR *, VICMD *);
++int v_hpagedown(SCR *, VICMD *);
++int v_pagedown(SCR *, VICMD *);
++int v_pageup(SCR *, VICMD *);
++int v_lineup(SCR *, VICMD *);
++int v_linedown(SCR *, VICMD *);
++int v_searchb(SCR *, VICMD *);
++int v_searchf(SCR *, VICMD *);
++int v_searchN(SCR *, VICMD *);
++int v_searchn(SCR *, VICMD *);
++int v_searchw(SCR *, VICMD *);
++int v_correct(SCR *, VICMD *, int);
++int v_sectionf(SCR *, VICMD *);
++int v_sectionb(SCR *, VICMD *);
++int v_sentencef(SCR *, VICMD *);
++int v_sentenceb(SCR *, VICMD *);
++int v_status(SCR *, VICMD *);
++int v_tcmd(SCR *, VICMD *, ARG_CHAR_T, u_int);
++int v_txt(SCR *, VICMD *, MARK *,
++ const CHAR_T *, size_t, ARG_CHAR_T, recno_t, u_long, u_int32_t);
++int v_txt_auto(SCR *, recno_t, TEXT *, size_t, TEXT *);
++int v_ulcase(SCR *, VICMD *);
++int v_mulcase(SCR *, VICMD *);
++int v_Undo(SCR *, VICMD *);
++int v_undo(SCR *, VICMD *);
++void v_eof(SCR *, MARK *);
++void v_eol(SCR *, MARK *);
++void v_nomove(SCR *);
++void v_sof(SCR *, MARK *);
++void v_sol(SCR *);
++int v_isempty(CHAR_T *, size_t);
++void v_emsg(SCR *, char *, vim_t);
++int v_wordW(SCR *, VICMD *);
++int v_wordw(SCR *, VICMD *);
++int v_wordE(SCR *, VICMD *);
++int v_worde(SCR *, VICMD *);
++int v_wordB(SCR *, VICMD *);
++int v_wordb(SCR *, VICMD *);
++int v_xchar(SCR *, VICMD *);
++int v_Xchar(SCR *, VICMD *);
++int v_yank(SCR *, VICMD *);
++int v_z(SCR *, VICMD *);
++int vs_crel(SCR *, long);
++int v_zexit(SCR *, VICMD *);
++int vi(SCR **);
++int v_curword(SCR *);
++int vs_line(SCR *, SMAP *, size_t *, size_t *);
++int vs_number(SCR *);
++void vs_busy(SCR *, const char *, busy_t);
++void vs_home(SCR *);
++void vs_update(SCR *, const char *, const CHAR_T *);
++void vs_msg(SCR *, mtype_t, char *, size_t);
++int vs_ex_resolve(SCR *, int *);
++int vs_resolve(SCR *, SCR *, int);
++int vs_repaint(SCR *, EVENT *);
++int vs_refresh(SCR *, int);
++int vs_column(SCR *, size_t *);
++size_t vs_screens(SCR *, recno_t, size_t *);
++size_t vs_columns(SCR *, CHAR_T *, recno_t, size_t *, size_t *);
++size_t vs_rcm(SCR *, recno_t, int);
++size_t vs_colpos(SCR *, recno_t, size_t);
++int vs_change(SCR *, recno_t, lnop_t);
++int vs_sm_fill(SCR *, recno_t, pos_t);
++int vs_sm_scroll(SCR *, MARK *, recno_t, scroll_t);
++int vs_sm_1up(SCR *);
++int vs_sm_1down(SCR *);
++int vs_sm_next(SCR *, SMAP *, SMAP *);
++int vs_sm_prev(SCR *, SMAP *, SMAP *);
++int vs_sm_cursor(SCR *, SMAP **);
++int vs_sm_position(SCR *, MARK *, u_long, pos_t);
++recno_t vs_sm_nlines(SCR *, SMAP *, recno_t, size_t);
++int vs_split(SCR *, SCR *, int);
++int vs_vsplit(SCR *, SCR *);
++int vs_discard(SCR *, SCR **);
++int vs_fg(SCR *, SCR **, CHAR_T *, int);
++int vs_bg(SCR *);
++int vs_swap(SCR *, SCR **, char *);
++int vs_resize(SCR *, long, adj_t);
++#endif /* common.h */
++char * codeset(void);
++void conv_init(SCR *, SCR *);
++int conv_enc(SCR *, int, char *);
++void conv_end(SCR *);
++int cut(SCR *, CHAR_T *, MARK *, MARK *, int);
++int cut_line(SCR *, recno_t, size_t, size_t, CB *);
++void cut_close(GS *);
++TEXT *text_init(SCR *, const CHAR_T *, size_t, size_t);
++void text_lfree(TEXTH *);
++void text_free(TEXT *);
++int del(SCR *, MARK *, MARK *, int);
++int looks_utf8(const char *, size_t);
++int looks_utf16(const char *, size_t);
++int decode_utf8(const char *);
++int decode_utf16(const char *, int);
++FREF *file_add(SCR *, char *);
++int file_init(SCR *, FREF *, char *, int);
++int file_end(SCR *, EXF *, int);
++int file_write(SCR *, MARK *, MARK *, char *, int);
++int file_m1(SCR *, int, int);
++int file_m2(SCR *, int);
++int file_m3(SCR *, int);
++int file_aw(SCR *, int);
++void set_alt_name(SCR *, char *);
++lockr_t file_lock(SCR *, char *, int, int);
++int v_key_init(SCR *);
++void v_key_ilookup(SCR *);
++size_t v_key_len(SCR *, ARG_CHAR_T);
++char *v_key_name(SCR *, ARG_CHAR_T);
++e_key_t v_key_val(SCR *, ARG_CHAR_T);
++int v_event_push(SCR *, EVENT *, CHAR_T *, size_t, u_int);
++int v_event_get(SCR *, EVENT *, int, u_int32_t);
++void v_event_err(SCR *, EVENT *);
++int v_event_flush(SCR *, u_int);
++int db_eget(SCR *, recno_t, CHAR_T **, size_t *, int *);
++int db_get(SCR *, recno_t, u_int32_t, CHAR_T **, size_t *);
++int db_delete(SCR *, recno_t);
++int db_append(SCR *, int, recno_t, CHAR_T *, size_t);
++int db_insert(SCR *, recno_t, CHAR_T *, size_t);
++int db_set(SCR *, recno_t, CHAR_T *, size_t);
++int db_exist(SCR *, recno_t);
++int db_last(SCR *, recno_t *);
++int db_rget(SCR *, recno_t, char **, size_t *);
++int db_rset(SCR *, recno_t, char *, size_t);
++void db_err(SCR *, recno_t);
++int log_init(SCR *, EXF *);
++int log_end(SCR *, EXF *);
++int log_cursor(SCR *);
++int log_line(SCR *, recno_t, u_int);
++int log_mark(SCR *, LMARK *);
++int log_backward(SCR *, MARK *);
++int log_setline(SCR *);
++int log_forward(SCR *, MARK *);
++int editor(GS *, int, char *[]);
++void v_end(GS *);
++int mark_init(SCR *, EXF *);
++int mark_end(SCR *, EXF *);
++int mark_get(SCR *, ARG_CHAR_T, MARK *, mtype_t);
++int mark_set(SCR *, ARG_CHAR_T, MARK *, int);
++int mark_insdel(SCR *, lnop_t, recno_t);
++void msgq(SCR *, mtype_t, const char *, ...);
++void msgq_wstr(SCR *, mtype_t, const CHAR_T *, const char *);
++void msgq_str(SCR *, mtype_t, const char *, const char *);
++void mod_rpt(SCR *);
++void msgq_status(SCR *, recno_t, u_int);
++int msg_open(SCR *, char *);
++void msg_close(GS *);
++const char *msg_cmsg(SCR *, cmsg_t, size_t *);
++const char *msg_cat(SCR *, const char *, size_t *);
++char *msg_print(SCR *, const char *, int *);
++int opts_init(SCR *, int *);
++int opts_set(SCR *, ARGS *[], char *);
++int o_set(SCR *, int, u_int, char *, u_long);
++int opts_empty(SCR *, int, int);
++void opts_dump(SCR *, enum optdisp);
++int opts_save(SCR *, FILE *);
++OPTLIST const *opts_search(CHAR_T *);
++void opts_nomatch(SCR *, CHAR_T *);
++int opts_copy(SCR *, SCR *);
++void opts_free(SCR *);
++int f_altwerase(SCR *, OPTION *, char *, u_long *);
++int f_columns(SCR *, OPTION *, char *, u_long *);
++int f_lines(SCR *, OPTION *, char *, u_long *);
++int f_lisp(SCR *, OPTION *, char *, u_long *);
++int f_msgcat(SCR *, OPTION *, char *, u_long *);
++int f_print(SCR *, OPTION *, char *, u_long *);
++int f_readonly(SCR *, OPTION *, char *, u_long *);
++int f_recompile(SCR *, OPTION *, char *, u_long *);
++int f_reformat(SCR *, OPTION *, char *, u_long *);
++int f_ttywerase(SCR *, OPTION *, char *, u_long *);
++int f_w300(SCR *, OPTION *, char *, u_long *);
++int f_w1200(SCR *, OPTION *, char *, u_long *);
++int f_w9600(SCR *, OPTION *, char *, u_long *);
++int f_window(SCR *, OPTION *, char *, u_long *);
++int f_encoding(SCR *, OPTION *, char *, u_long *);
++int put(SCR *, CB *, CHAR_T *, MARK *, MARK *, int);
++int rcv_tmp(SCR *, EXF *, char *);
++int rcv_init(SCR *);
++int rcv_sync(SCR *, u_int);
++int rcv_list(SCR *);
++int rcv_read(SCR *, FREF *);
++int screen_init(GS *, SCR *, SCR **);
++int screen_end(SCR *);
++SCR *screen_next(SCR *);
++int f_search(SCR *,
++ MARK *, MARK *, CHAR_T *, size_t, CHAR_T **, u_int);
++int b_search(SCR *,
++ MARK *, MARK *, CHAR_T *, size_t, CHAR_T **, u_int);
++void search_busy(SCR *, busy_t);
++int seq_set(SCR *, CHAR_T *,
++ size_t, CHAR_T *, size_t, CHAR_T *, size_t, seq_t, int);
++int seq_delete(SCR *, CHAR_T *, size_t, seq_t);
++int seq_free(SEQ *);
++SEQ *seq_find
++ (SCR *, SEQ **, EVENT *, CHAR_T *, size_t, seq_t, int *);
++void seq_close(GS *);
++int seq_dump(SCR *, seq_t, int);
++int seq_save(SCR *, FILE *, char *, seq_t);
++int e_memcmp(CHAR_T *, EVENT *, size_t);
++void *binc(SCR *, void *, size_t *, size_t);
++int nonblank(SCR *, recno_t, size_t *);
++char *join(char *, char *);
++char *expanduser(char *);
++char *quote(char *);
++char *v_strdup(SCR *, const char *, size_t);
++CHAR_T *v_wstrdup(SCR *, const CHAR_T *, size_t);
++enum nresult nget_uslong(u_long *, const CHAR_T *, CHAR_T **, int);
++enum nresult nget_slong(long *, const CHAR_T *, CHAR_T **, int);
++void timepoint_steady(struct timespec *);
++void timepoint_system(struct timespec *);
++void TRACE(SCR *, const char *, ...);
diff --cc usr.bin/vi/options_def.h
index 54dd6c20c891,000000000000..54dd6c20c891
mode 100644,000000..100644
--- a/usr.bin/vi/options_def.h
+++ b/usr.bin/vi/options_def.h
More information about the dev-commits-src-main
mailing list