 @@ -1,165 +1,160 @@
-/*	$NetBSD: delete.c,v 1.2 2012/01/21 17:12:56 christos Exp $ */
+/*	$NetBSD: delete.c,v 1.3 2012/01/21 19:29:41 christos Exp $ */
 /*-
  * 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.
+ *
  * See the LICENSE file for redistribution information.
  */
 #include "config.h"
 #ifndef lint
 static const char sccsid[] = "Id: delete.c,v 10.17 2001/06/25 15:19:09 skimo Exp (Berkeley) Date: 2001/06/25 15:19:09";
 #endif /* not lint */
 #include <sys/types.h>
 #include <sys/queue.h>
 #include <bitstring.h>
 #include <errno.h>
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include "common.h"
 /*
  * del --
  *	Delete a range of text.
+ *
  * PUBLIC: int del __P((SCR *, MARK *, MARK *, int));
  */
 int
 del(SCR *sp, MARK *fm, MARK *tm, int lmode)
+{
 	db_recno_t lno;
 	size_t blen, len, nlen, tlen;
 	CHAR_T *bp, *p;
 	int eof, rval;
 	bp = NULL;
 	/* Case 1 -- delete in line mode. */
 	if (lmode) {
 		for (lno = tm->lno; lno >= fm->lno; --lno) {
 			if (db_delete(sp, lno))
 				return (1);
 			++sp->rptlines[L_DELETED];
 			if (lno % INTERRUPT_CHECK == 0 && INTERRUPTED(sp))
 				break;
+		}
 		goto done;
+	}
 	/*
 	 * Case 2 -- delete to EOF.  This is a special case because it's
 	 * easier to pick it off than try and find it in the other cases.
  	 */
 	if (db_last(sp, &lno))
 		return (1);
 	if (tm->lno >= lno) {
 		if (tm->lno == lno) {
 			if (db_get(sp, lno, DBG_FATAL, &p, &len))
 				return (1);
 			eof = tm->cno >= len ? 1 : 0;
 		} else
 			eof = 1;
 		if (eof) {
 			for (lno = tm->lno; lno > fm->lno; --lno) {
 				if (db_delete(sp, lno))
 					return (1);
 				++sp->rptlines[L_DELETED];
 				if (lno %
 				    INTERRUPT_CHECK == 0 && INTERRUPTED(sp))
 					break;
+			}
 			if (db_get(sp, fm->lno, DBG_FATAL, &p, &len))
 				return (1);
 			GET_SPACE_RETW(sp, bp, blen, fm->cno);
 			MEMCPYW(bp, p, fm->cno);
 			if (db_set(sp, fm->lno, bp, fm->cno))
 				return (1);
 			goto done;
+		}
+	}
 	/* Case 3 -- delete within a single line. */
 	if (tm->lno == fm->lno) {
 		if (tm->cno == fm->cno) {
 			if (db_delete(sp, fm->lno))
 				return (1);
 			goto done;
 		if (db_get(sp, fm->lno, DBG_FATAL, &p, &len))
 			return (1);
 		GET_SPACE_RETW(sp, bp, blen, len);
 		if (fm->cno != 0)
 			MEMCPYW(bp, p, fm->cno);
 		MEMCPYW(bp + fm->cno, p + (tm->cno + 1),
 			len - (tm->cno + 1));
 		if (db_set(sp, fm->lno,
 		    bp, len - ((tm->cno - fm->cno) + 1)))
 			goto err;
 		goto done;
+	}
 	/*
 	 * Case 4 -- delete over multiple lines.
+	 *
 	 * Copy the start partial line into place.
 	 */
 	if ((tlen = fm->cno) != 0) {
 		if (db_get(sp, fm->lno, DBG_FATAL, &p, NULL))
 			return (1);
 		GET_SPACE_RETW(sp, bp, blen, tlen + 256);
 		MEMCPYW(bp, p, tlen);
+	}
 	/* Copy the end partial line into place. */
 	if (db_get(sp, tm->lno, DBG_FATAL, &p, &len))
 		goto err;
 	if (len != 0 && tm->cno != len - 1) {
 		/*
 		 * XXX
 		 * We can overflow memory here, if the total length is greater
 		 * than SIZE_T_MAX.  The only portable way I've found to test
 		 * is depending on the overflow being less than the value.
 		 */
 		nlen = (len - (tm->cno + 1)) + tlen;
 		if (tlen > nlen) {
 			msgq(sp, M_ERR, "002|Line length overflow");
 			goto err;
+		}
 		if (tlen == 0) {
 			GET_SPACE_RETW(sp, bp, blen, nlen);
 		} else
 			ADD_SPACE_RETW(sp, bp, blen, nlen);
 		MEMCPYW(bp + tlen, p + (tm->cno + 1), len - (tm->cno + 1));
 		tlen += len - (tm->cno + 1);
+	}
 	/* Set the current line. */
 	if (db_set(sp, fm->lno, bp, tlen))
 		goto err;
 	/* Delete the last and intermediate lines. */
 	for (lno = tm->lno; lno > fm->lno; --lno) {
 		if (db_delete(sp, lno))
 			goto err;
 		++sp->rptlines[L_DELETED];
 		if (lno % INTERRUPT_CHECK == 0 && INTERRUPTED(sp))
 			break;
+	}
 done:	rval = 0;
 	if (0)
 err:		rval = 1;
 	if (bp != NULL)
 		FREE_SPACEW(sp, bp, blen);
 	return (rval);
+}

 @@ -1,228 +1,224 @@
-/*	$NetBSD: getc.c,v 1.4 2012/01/21 17:12:56 christos Exp $ */
+/*	$NetBSD: getc.c,v 1.5 2012/01/21 19:29:41 christos Exp $ */
 /*-
  * 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.
+ *
  * See the LICENSE file for redistribution information.
  */
 #include "config.h"
 #ifndef lint
 static const char sccsid[] = "Id: getc.c,v 10.12 2001/06/25 15:19:30 skimo Exp (Berkeley) Date: 2001/06/25 15:19:30";
 #endif /* not lint */
 #include <sys/types.h>
 #include <sys/queue.h>
 #include <sys/time.h>
 #include <bitstring.h>
 #include <ctype.h>
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include "../common/common.h"
 #include "vi.h"
 /*
  * Character stream routines --
  *	These routines return the file a character at a time.  There are two
  *	special cases.  First, the end of a line, end of a file, start of a
  *	file and empty lines are returned as special cases, and no character
  *	is returned.  Second, empty lines include lines that have only white
  *	space in them, because the vi search functions don't care about white
  *	space, and this makes it easier for them to be consistent.
  */
 /*
  * cs_init --
  *	Initialize character stream routines.
+ *
  * PUBLIC: int cs_init __P((SCR *, VCS *));
  */
 int
 cs_init(SCR *sp, VCS *csp)
+{
 	int isempty;
 	if (db_eget(sp, csp->cs_lno, &csp->cs_bp, &csp->cs_len, &isempty)) {
 		if (isempty)
 			msgq(sp, M_BERR, "177|Empty file");
 		return (1);
+	}
 	if (csp->cs_len == 0 || v_isempty(csp->cs_bp, csp->cs_len)) {
 		csp->cs_cno = 0;
 		csp->cs_flags = CS_EMP;
 	} else {
 		csp->cs_flags = 0;
 		csp->cs_ch = csp->cs_bp[csp->cs_cno];
+	}
 	return (0);
+}
 /*
  * cs_next --
  *	Retrieve the next character.
+ *
  * PUBLIC: int cs_next __P((SCR *, VCS *));
  */
 int
 cs_next(SCR *sp, VCS *csp)
+{
 	CHAR_T *p;
 	switch (csp->cs_flags) {
 	case CS_EMP:				/* EMP; get next line. */
 	case CS_EOL:				/* EOL; get next line. */
 		if (db_get(sp, ++csp->cs_lno, 0, &p, &csp->cs_len)) {
 			--csp->cs_lno;
 			csp->cs_flags = CS_EOF;
 		} else {
 			csp->cs_bp = p;
 			if (csp->cs_len == 0 ||
 			    v_isempty(csp->cs_bp, csp->cs_len)) {
 				csp->cs_cno = 0;
 				csp->cs_flags = CS_EMP;
 			} else {
 				csp->cs_flags = 0;
 				csp->cs_ch = csp->cs_bp[csp->cs_cno = 0];
+			}
+		}
 		break;
 	case 0:
 		if (csp->cs_cno == csp->cs_len - 1)
 			csp->cs_flags = CS_EOL;
 		else
 			csp->cs_ch = csp->cs_bp[++csp->cs_cno];
 		break;
 	case CS_EOF:				/* EOF. */
 		break;
 	default:
 		abort();
 		/* NOTREACHED */
+	}
 	return (0);
+}
 /*
  * cs_fspace --
  *	If on a space, eat forward until something other than a
  *	whitespace character.
+ *
  * XXX
  * Semantics of checking the current character were coded for the fword()
  * function -- once the other word routines are converted, they may have
  * to change.
+ *
  * PUBLIC: int cs_fspace __P((SCR *, VCS *));
  */
 int
 cs_fspace(SCR *sp, VCS *csp)
+{
 	if (csp->cs_flags != 0 || !ISBLANK2(csp->cs_ch))
 		return (0);
 	for (;;) {
 		if (cs_next(sp, csp))
 			return (1);
 		if (csp->cs_flags != 0 || !ISBLANK2(csp->cs_ch))
 			break;
+	}
 	return (0);
+}
 /*
  * cs_fblank --
  *	Eat forward to the next non-whitespace character.
+ *
  * PUBLIC: int cs_fblank __P((SCR *, VCS *));
  */
 int
 cs_fblank(SCR *sp, VCS *csp)
+{
 	if (csp->cs_flags == CS_EMP)
 		return (0);
 	for (;;) {
 		if (cs_next(sp, csp))
 			return (1);
-		if (csp->cs_flags == CS_EOL ||
+		if (csp->cs_flags == CS_EOL || csp->cs_flags == CS_EMP ||
 		    (csp->cs_flags == 0 && ISBLANK2(csp->cs_ch)))
 			continue;
 		break;
+	}
 	return (0);
+}
 /*
  * cs_prev --
  *	Retrieve the previous character.
+ *
  * PUBLIC: int cs_prev __P((SCR *, VCS *));
  */
 int
 cs_prev(SCR *sp, VCS *csp)
+{
 	switch (csp->cs_flags) {
 	case CS_EMP:				/* EMP; get previous line. */
 	case CS_EOL:				/* EOL; get previous line. */
 		if (csp->cs_lno == 1) {		/* SOF. */
 			csp->cs_flags = CS_SOF;
 			break;
+		}
 		if (db_get(sp,			/* The line should exist. */
 		    --csp->cs_lno, DBG_FATAL, &csp->cs_bp, &csp->cs_len)) {
 			++csp->cs_lno;
 			return (1);
+		}
 		if (csp->cs_len == 0 || v_isempty(csp->cs_bp, csp->cs_len)) {
 			csp->cs_cno = 0;
 			csp->cs_flags = CS_EMP;
 		} else {
 			csp->cs_flags = 0;
 			csp->cs_cno = csp->cs_len - 1;
 			csp->cs_ch = csp->cs_bp[csp->cs_cno];
+		}
 		break;
 	case CS_EOF:				/* EOF: get previous char. */
 	case 0:
 		if (csp->cs_cno == 0)
 			if (csp->cs_lno == 1)
 				csp->cs_flags = CS_SOF;
 			else
 				csp->cs_flags = CS_EOL;
 		else
 			csp->cs_ch = csp->cs_bp[--csp->cs_cno];
 		break;
 	case CS_SOF:				/* SOF. */
 		break;
 	default:
 		abort();
 		/* NOTREACHED */
+	}
 	return (0);
+}
 /*
  * cs_bblank --
  *	Eat backward to the next non-whitespace character.
+ *
  * PUBLIC: int cs_bblank __P((SCR *, VCS *));
  */
 int
 cs_bblank(SCR *sp, VCS *csp)
+{
 	if (csp->cs_flags == CS_EMP)
 		return (0);
 	for (;;) {
 		if (cs_prev(sp, csp))
 			return (1);
-		if (csp->cs_flags == CS_EOL ||
+		if (csp->cs_flags == CS_EOL || csp->cs_flags == CS_EMP ||
 		    (csp->cs_flags == 0 && ISBLANK2(csp->cs_ch)))
 			continue;
 		break;
+	}
 	return (0);
+}