Update nvi-1.79 to 2.1.1-4334a8297f

This is the gsoc-2011 project to clean up and backport multibyte support
from other nvi forks in a form we can use.

USE_WIDECHAR is on unless building for the rescue crunchgen. This should
allow editing in the native locale encoding.

USE_ICONV depends on make.conf having 'WITH_ICONV=YES' for now.  This
adds the ability to do things like edit a KOI8-R file while having $LANG
set to (say) en_US.UTF-8.  iconv is used to transcode the characters for
display.

Other points:
* It uses gencat and catopen/etc instead of homegrown msg catalog stuff.
* A lot of stuff has been trimmed out, eg: the perl and tcl bindings which
  we could never use in base anyway.
* It uses ncursesw when in widechar mode.  This could be interesting.

GSoC info: http://www.google-melange.com/gsoc/proposal/review/google/gsoc2011/zy/1
Repo at: https://github.com/lichray/nvi2

Obtained from:  Zhihao Yuan <lichray@gmail.com>

1 files changed, 0 insertions, 525 deletions

diff --git a/contrib/nvi/common/api.c b/contrib/nvi/common/api.c
deleted file mode 100644
index 35d9f0c..0000000
--- a/contrib/nvi/common/api.c
+++ /dev/null
@@ -1,525 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- * Copyright (c) 1992, 1993, 1994, 1995, 1996
- *	Keith Bostic.  All rights reserved.
- * Copyright (c) 1995
- *	George V. Neville-Neil. All rights reserved.
- *
- * See the LICENSE file for redistribution information.
- */
-
-#include "config.h"
-
-#ifndef lint
-static const char sccsid[] = "@(#)api.c	8.26 (Berkeley) 10/14/96";
-#endif /* not lint */
-
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/time.h>
-
-#include <bitstring.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <termios.h>
-#include <unistd.h>
-
-#include "../common/common.h"
-
-extern GS *__global_list;			/* XXX */
-
-/*
- * api_fscreen --
- *	Return a pointer to the screen specified by the screen id
- *	or a file name.
- *
- * PUBLIC: SCR *api_fscreen __P((int, char *));
- */
-SCR *
-api_fscreen(id, name)
-	int id;
-	char *name;
-{
-	GS *gp;
-	SCR *tsp;
-
-	gp = __global_list;
-
-	/* Search the displayed list. */
-	for (tsp = gp->dq.cqh_first;
-	    tsp != (void *)&gp->dq; tsp = tsp->q.cqe_next)
-		if (name == NULL) {
-			if (id == tsp->id)
-				return (tsp);
-		} else if (!strcmp(name, tsp->frp->name))
-			return (tsp);
-
-	/* Search the hidden list. */
-	for (tsp = gp->hq.cqh_first;
-	    tsp != (void *)&gp->hq; tsp = tsp->q.cqe_next)
-		if (name == NULL) {
-			if (id == tsp->id)
-				return (tsp);
-		} else if (!strcmp(name, tsp->frp->name))
-			return (tsp);
-	return (NULL);
-}
-
-/*
- * api_aline --
- *	Append a line.
- *
- * PUBLIC: int api_aline __P((SCR *, recno_t, char *, size_t));
- */
-int
-api_aline(sp, lno, line, len)
-	SCR *sp;
-	recno_t lno;
-	char *line;
-	size_t len;
-{
-	return (db_append(sp, 1, lno, line, len));
-}
-
-/*
- * api_dline --
- *	Delete a line.
- *
- * PUBLIC: int api_dline __P((SCR *, recno_t));
- */
-int
-api_dline(sp, lno)
-	SCR *sp;
-	recno_t lno;
-{
-	return (db_delete(sp, lno));
-}
-
-/*
- * api_gline --
- *	Get a line.
- *
- * PUBLIC: int api_gline __P((SCR *, recno_t, char **, size_t *));
- */
-int
-api_gline(sp, lno, linepp, lenp)
-	SCR *sp;
-	recno_t lno;
-	char **linepp;
-	size_t *lenp;
-{
-	int isempty;
-
-	if (db_eget(sp, lno, linepp, lenp, &isempty)) {
-		if (isempty)
-			msgq(sp, M_ERR, "209|The file is empty");
-		return (1);
-	}
-	return (0);
-}
-
-/*
- * api_iline --
- *	Insert a line.
- *
- * PUBLIC: int api_iline __P((SCR *, recno_t, char *, size_t));
- */
-int
-api_iline(sp, lno, line, len)
-	SCR *sp;
-	recno_t lno;
-	char *line;
-	size_t len;
-{
-	return (db_insert(sp, lno, line, len));
-}
-
-/*
- * api_lline --
- *	Return the line number of the last line in the file.
- *
- * PUBLIC: int api_lline __P((SCR *, recno_t *));
- */
-int
-api_lline(sp, lnop)
-	SCR *sp;
-	recno_t *lnop;
-{
-	return (db_last(sp, lnop));
-}
-
-/*
- * api_sline --
- *	Set a line.
- *
- * PUBLIC: int api_sline __P((SCR *, recno_t, char *, size_t));
- */
-int
-api_sline(sp, lno, line, len)
-	SCR *sp;
-	recno_t lno;
-	char *line;
-	size_t len;
-{
-	return (db_set(sp, lno, line, len));
-}
-
-/*
- * api_getmark --
- *	Get the mark.
- *
- * PUBLIC: int api_getmark __P((SCR *, int, MARK *));
- */
-int
-api_getmark(sp, markname, mp)
-	SCR *sp;
-	int markname;
-	MARK *mp;
-{
-	return (mark_get(sp, (ARG_CHAR_T)markname, mp, M_ERR));
-}
-
-/*
- * api_setmark --
- *	Set the mark.
- *
- * PUBLIC: int api_setmark __P((SCR *, int, MARK *));
- */
-int
-api_setmark(sp, markname, mp)
-	SCR *sp;
-	int markname;
-	MARK *mp;
-{
-	return (mark_set(sp, (ARG_CHAR_T)markname, mp, 1));
-}
-
-/*
- * api_nextmark --
- *	Return the first mark if next not set, otherwise return the
- *	subsequent mark.
- *
- * PUBLIC: int api_nextmark __P((SCR *, int, char *));
- */
-int
-api_nextmark(sp, next, namep)
-	SCR *sp;
-	int next;
-	char *namep;
-{
-	LMARK *mp;
-
-	mp = sp->ep->marks.lh_first;
-	if (next)
-		for (; mp != NULL; mp = mp->q.le_next)
-			if (mp->name == *namep) {
-				mp = mp->q.le_next;
-				break;
-			}
-	if (mp == NULL)
-		return (1);
-	*namep = mp->name;
-	return (0);
-}
-
-/*
- * api_getcursor --
- *	Get the cursor.
- *
- * PUBLIC: int api_getcursor __P((SCR *, MARK *));
- */
-int
-api_getcursor(sp, mp)
-	SCR *sp;
-	MARK *mp;
-{
-	mp->lno = sp->lno;
-	mp->cno = sp->cno;
-	return (0);
-}
-
-/*
- * api_setcursor --
- *	Set the cursor.
- *
- * PUBLIC: int api_setcursor __P((SCR *, MARK *));
- */
-int
-api_setcursor(sp, mp)
-	SCR *sp;
-	MARK *mp;
-{
-	size_t len;
-
-	if (db_get(sp, mp->lno, DBG_FATAL, NULL, &len))
-		return (1);
-	if (mp->cno < 0 || mp->cno > len) {
-		msgq(sp, M_ERR, "Cursor set to nonexistent column");
-		return (1);
-	}
-
-	/* Set the cursor. */
-	sp->lno = mp->lno;
-	sp->cno = mp->cno;
-	return (0);
-}
-
-/*
- * api_emessage --
- *	Print an error message.
- *
- * PUBLIC: void api_emessage __P((SCR *, char *));
- */
-void
-api_emessage(sp, text)
-	SCR *sp;
-	char *text;
-{
-	msgq(sp, M_ERR, "%s", text);
-}
-
-/*
- * api_imessage --
- *	Print an informational message.
- *
- * PUBLIC: void api_imessage __P((SCR *, char *));
- */
-void
-api_imessage(sp, text)
-	SCR *sp;
-	char *text;
-{
-	msgq(sp, M_INFO, "%s", text);
-}
-
-/*
- * api_edit
- *	Create a new screen and return its id 
- *	or edit a new file in the current screen.
- *
- * PUBLIC: int api_edit __P((SCR *, char *, SCR **, int));
- */
-int
-api_edit(sp, file, spp, newscreen)
-	SCR *sp;
-	char *file;
-	SCR **spp;
-	int newscreen;
-{
-	ARGS *ap[2], a;
-	EXCMD cmd;
-
-	if (file) {
-		ex_cinit(&cmd, C_EDIT, 0, OOBLNO, OOBLNO, 0, ap);
-		ex_cadd(&cmd, &a, file, strlen(file));
-	} else
-		ex_cinit(&cmd, C_EDIT, 0, OOBLNO, OOBLNO, 0, NULL);
-	if (newscreen)
-		cmd.flags |= E_NEWSCREEN;		/* XXX */
-	if (cmd.cmd->fn(sp, &cmd))
-		return (1);
-	*spp = sp->nextdisp;
-	return (0);
-}
-
-/*
- * api_escreen
- *	End a screen.
- *
- * PUBLIC: int api_escreen __P((SCR *));
- */
-int
-api_escreen(sp)
-	SCR *sp;
-{
-	EXCMD cmd;
-
-	/*
-	 * XXX
-	 * If the interpreter exits anything other than the current
-	 * screen, vi isn't going to update everything correctly.
-	 */
-	ex_cinit(&cmd, C_QUIT, 0, OOBLNO, OOBLNO, 0, NULL);
-	return (cmd.cmd->fn(sp, &cmd));
-}
-
-/*
- * api_swscreen --
- *    Switch to a new screen.
- *
- * PUBLIC: int api_swscreen __P((SCR *, SCR *));
- */
-int
-api_swscreen(sp, new)
-      SCR *sp, *new;
-{
-	/*
-	 * XXX
-	 * If the interpreter switches from anything other than the
-	 * current screen, vi isn't going to update everything correctly.
-	 */
-	sp->nextdisp = new;
-	F_SET(sp, SC_SSWITCH);
-
-	return (0);
-}
-
-/*
- * api_map --
- *	Map a key.
- *
- * PUBLIC: int api_map __P((SCR *, char *, char *, size_t));
- */
-int
-api_map(sp, name, map, len)
-	SCR *sp;
-	char *name, *map;
-	size_t len;
-{
-	ARGS *ap[3], a, b;
-	EXCMD cmd;
-
-	ex_cinit(&cmd, C_MAP, 0, OOBLNO, OOBLNO, 0, ap);
-	ex_cadd(&cmd, &a, name, strlen(name));
-	ex_cadd(&cmd, &b, map, len);
-	return (cmd.cmd->fn(sp, &cmd));
-}
-
-/*
- * api_unmap --
- *	Unmap a key.
- *
- * PUBLIC: int api_unmap __P((SCR *, char *));
- */
-int 
-api_unmap(sp, name)
-	SCR *sp;
-	char *name;
-{
-	ARGS *ap[2], a;
-	EXCMD cmd;
-
-	ex_cinit(&cmd, C_UNMAP, 0, OOBLNO, OOBLNO, 0, ap);
-	ex_cadd(&cmd, &a, name, strlen(name));
-	return (cmd.cmd->fn(sp, &cmd));
-}
-
-/*
- * api_opts_get --
- *	Return a option value as a string, in allocated memory.
- *	If the option is of type boolean, boolvalue is (un)set
- *	according to the value; otherwise boolvalue is -1.
- *
- * PUBLIC: int api_opts_get __P((SCR *, char *, char **, int *));
- */
-int
-api_opts_get(sp, name, value, boolvalue)
-	SCR *sp;
-	char *name, **value;
-	int *boolvalue;
-{
-	OPTLIST const *op;
-	int offset;
-
-	if ((op = opts_search(name)) == NULL) {
-		opts_nomatch(sp, name);
-		return (1);
-	}
-
-	offset = op - optlist;
-	if (boolvalue != NULL)
-		*boolvalue = -1;
-	switch (op->type) {
-	case OPT_0BOOL:
-	case OPT_1BOOL:
-		MALLOC_RET(sp, *value, char *, strlen(op->name) + 2 + 1);
-		(void)sprintf(*value,
-		    "%s%s", O_ISSET(sp, offset) ? "" : "no", op->name);
-		if (boolvalue != NULL)
-			*boolvalue = O_ISSET(sp, offset);
-		break;
-	case OPT_NUM:
-		MALLOC_RET(sp, *value, char *, 20);
-		(void)sprintf(*value, "%lu", (u_long)O_VAL(sp, offset));
-		break;
-	case OPT_STR:
-		if (O_STR(sp, offset) == NULL) {
-			MALLOC_RET(sp, *value, char *, 2);
-			value[0] = '\0';
-		} else {
-			MALLOC_RET(sp,
-			    *value, char *, strlen(O_STR(sp, offset)) + 1);
-			(void)sprintf(*value, "%s", O_STR(sp, offset));
-		}
-		break;
-	}
-	return (0);
-}
-
-/*
- * api_opts_set --
- *	Set options.
- *
- * PUBLIC: int api_opts_set __P((SCR *, char *, char *, u_long, int));
- */
-int
-api_opts_set(sp, name, str_value, num_value, bool_value)
-	SCR *sp;
-	char *name, *str_value;
-	u_long num_value;
-	int bool_value;
-{
-	ARGS *ap[2], a, b;
-	OPTLIST const *op;
-	int rval;
-	size_t blen;
-	char *bp;
-
-	if ((op = opts_search(name)) == NULL) {
-		opts_nomatch(sp, name);
-		return (1);
-	}
-
-	switch (op->type) {
-	case OPT_0BOOL:
-	case OPT_1BOOL:
-		GET_SPACE_RET(sp, bp, blen, 64);
-		a.len = snprintf(bp, 64, "%s%s", bool_value ? "" : "no", name);
-		break;
-	case OPT_NUM:
-		GET_SPACE_RET(sp, bp, blen, 64);
-		a.len = snprintf(bp, 64, "%s=%lu", name, num_value);
-		break;
-	case OPT_STR:
-		GET_SPACE_RET(sp, bp, blen, 1024);
-		a.len = snprintf(bp, 1024, "%s=%s", name, str_value);
-		break;
-	}
-	a.bp = bp;
-	b.len = 0;
-	b.bp = NULL;
-	ap[0] = &a;
-	ap[1] = &b;
-	rval = opts_set(sp, ap, NULL);
-
-	FREE_SPACE(sp, bp, blen);
-
-	return (rval);
-}
-
-/*
- * api_run_str --
- *      Execute a string as an ex command.
- *
- * PUBLIC: int api_run_str __P((SCR *, char *));
- */
-int     
-api_run_str(sp, cmd)
-	SCR *sp;
-	char *cmd;
-{
-	return (ex_run_str(sp, NULL, cmd, strlen(cmd), 0, 0));
-}