1 files changed, 107 insertions, 0 deletions
diff --git a/contrib/nvi/vi/v_delete.c b/contrib/nvi/vi/v_delete.c
new file mode 100644
index 0000000..70df78b
--- /dev/null
+++ b/contrib/nvi/vi/v_delete.c
@@ -0,0 +1,107 @@
+/*-
+ * 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[] = "@(#)v_delete.c	10.9 (Berkeley) 10/23/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 "../common/common.h"
+#include "vi.h"
+
+/*
+ * v_delete -- [buffer][count]d[count]motion
+ *	       [buffer][count]D
+ *	Delete a range of text.
+ *
+ * PUBLIC: int v_delete __P((SCR *, VICMD *));
+ */
+int
+v_delete(sp, vp)
+	SCR *sp;
+	VICMD *vp;
+{
+	recno_t nlines;
+	size_t len;
+	int lmode;
+
+	lmode = F_ISSET(vp, VM_LMODE) ? CUT_LINEMODE : 0;
+
+	/* Yank the lines. */
+	if (cut(sp, F_ISSET(vp, VC_BUFFER) ? &vp->buffer : NULL,
+	    &vp->m_start, &vp->m_stop,
+	    lmode | (F_ISSET(vp, VM_CUTREQ) ? CUT_NUMREQ : CUT_NUMOPT)))
+		return (1);
+
+	/* Delete the lines. */
+	if (del(sp, &vp->m_start, &vp->m_stop, lmode))
+		return (1);
+
+	/*
+	 * Check for deletion of the entire file.  Try to check a close
+	 * by line so we don't go to the end of the file unnecessarily.
+	 */
+	if (!db_exist(sp, vp->m_final.lno + 1)) {
+		if (db_last(sp, &nlines))
+			return (1);
+		if (nlines == 0) {
+			vp->m_final.lno = 1;
+			vp->m_final.cno = 0;
+			return (0);
+		}
+	}
+
+	/*
+	 * One special correction, in case we've deleted the current line or
+	 * character.  We check it here instead of checking in every command
+	 * that can be a motion component.
+	 */
+	if (db_get(sp, vp->m_final.lno, 0, NULL, &len)) {
+		if (db_get(sp, nlines, DBG_FATAL, NULL, &len))
+			return (1);
+		vp->m_final.lno = nlines;
+	}
+
+	/*
+	 * !!!
+	 * Cursor movements, other than those caused by a line mode command
+	 * moving to another line, historically reset the relative position.
+	 *
+	 * This currently matches the check made in v_yank(), I'm hoping that
+	 * they should be consistent...
+	 */  
+	if (!F_ISSET(vp, VM_LMODE)) {
+		F_CLR(vp, VM_RCM_MASK);
+		F_SET(vp, VM_RCM_SET);
+
+		/* Make sure the set cursor position exists. */
+		if (vp->m_final.cno >= len)
+			vp->m_final.cno = len ? len - 1 : 0;
+	}
+
+	/*
+	 * !!!
+	 * The "dd" command moved to the first non-blank; "d<motion>"
+	 * didn't.
+	 */
+	if (F_ISSET(vp, VM_LDOUBLE)) {
+		F_CLR(vp, VM_RCM_MASK);
+		F_SET(vp, VM_RCM_SETFNB);
+	}
+	return (0);
+}