Release FreeBSD 1.1.5.1release/1.1.5.1_cvsreleng/1

This commit was manufactured to restore the state of the 1.1.5.1-RELEASE image.
Releases prior to 5.3-RELEASE are omitting the secure/ and crypto/ subdirs.

1 files changed, 162 insertions, 0 deletions

diff --git a/usr.bin/vi/vi/v_increment.c b/usr.bin/vi/vi/v_increment.c
new file mode 100644
index 000000000000..aee358922662
--- /dev/null
+++ b/usr.bin/vi/vi/v_increment.c
@@ -0,0 +1,162 @@
+/*-
+ * Copyright (c) 1992, 1993, 1994
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)v_increment.c	8.8 (Berkeley) 3/8/94";
+#endif /* not lint */
+
+#include <sys/types.h>
+#include <queue.h>
+#include <sys/time.h>
+
+#include <bitstring.h>
+#include <errno.h>
+#include <limits.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <termios.h>
+
+#include <db.h>
+#include <regex.h>
+
+#include "vi.h"
+#include "vcmd.h"
+
+static char * const fmt[] = {
+#define	DEC	0
+	"%ld",
+#define	SDEC	1
+	"%+ld",
+#define	HEXC	2
+	"%#0.*lX",
+#define	HEXL	3
+	"%#0.*lx",
+#define	OCTAL	4
+	"%#0.*lo",
+};
+
+/*
+ * v_increment -- [count]#[#+-]
+ *	Increment/decrement a keyword number.
+ */
+int
+v_increment(sp, ep, vp)
+	SCR *sp;
+	EXF *ep;
+	VICMDARG *vp;
+{
+	VI_PRIVATE *vip;
+	u_long ulval;
+	long lval;
+	size_t blen, len, nlen;
+	int rval;
+	char *bp, *ntype, *p, nbuf[100];
+
+	vip = VIP(sp);
+
+	/* Do repeat operations. */
+	if (vp->character == '#')
+		vp->character = vip->inc_lastch;
+
+	/* Get new value. */
+	if (F_ISSET(vp, VC_C1SET))
+		vip->inc_lastval = vp->count;
+
+	if (vp->character != '+' && vp->character != '-') {
+		msgq(sp, M_ERR, "usage: %s.", vp->kp->usage);
+		return (1);
+	}
+	vip->inc_lastch = vp->character;
+
+	/* Figure out the resulting type and number. */
+	p = vp->keyword;
+	len = vp->klen;
+	if (len > 1 && p[0] == '0') {
+		if (vp->character == '+') {
+			ulval = strtoul(vp->keyword, NULL, 0);
+			if (ULONG_MAX - ulval < vip->inc_lastval)
+				goto overflow;
+			ulval += vip->inc_lastval;
+		} else {
+			ulval = strtoul(vp->keyword, NULL, 0);
+			if (ulval < vip->inc_lastval)
+				goto underflow;
+			ulval -= vip->inc_lastval;
+		}
+		ntype = fmt[OCTAL];
+		if (len > 2)
+			if (p[1] == 'X')
+				ntype = fmt[HEXC];
+			else if (p[1] == 'x')
+				ntype = fmt[HEXL];
+		nlen = snprintf(nbuf, sizeof(nbuf), ntype, len, ulval);
+	} else {
+		if (vp->character == '+') {
+			lval = strtol(vp->keyword, NULL, 0);
+			if (lval > 0 && LONG_MAX - lval < vip->inc_lastval) {
+overflow:			msgq(sp, M_ERR, "Resulting number too large.");
+				return (1);
+			}
+			lval += vip->inc_lastval;
+		} else {
+			lval = strtol(vp->keyword, NULL, 0);
+			if (lval < 0 && -(LONG_MIN - lval) < vip->inc_lastval) {
+underflow:			msgq(sp, M_ERR, "Resulting number too small.");
+				return (1);
+			}
+			lval -= vip->inc_lastval;
+		}
+		ntype = lval != 0 &&
+		    (*vp->keyword == '+' || *vp->keyword == '-') ?
+		    fmt[SDEC] : fmt[DEC];
+		nlen = snprintf(nbuf, sizeof(nbuf), ntype, lval);
+	}
+
+	if ((p = file_gline(sp, ep, vp->m_start.lno, &len)) == NULL) {
+		GETLINE_ERR(sp, vp->m_start.lno);
+		return (1);
+	}
+
+	GET_SPACE_RET(sp, bp, blen, len + nlen);
+	memmove(bp, p, vp->m_start.cno);
+	memmove(bp + vp->m_start.cno, nbuf, nlen);
+	memmove(bp + vp->m_start.cno + nlen,
+	    p + vp->m_start.cno + vp->klen, len - vp->m_start.cno - vp->klen);
+	len = len - vp->klen + nlen;
+
+	rval = file_sline(sp, ep, vp->m_start.lno, bp, len);
+	FREE_SPACE(sp, bp, blen);
+	return (rval);
+}