Sat Jan 21 19:32:37 2012 UTC ()

PR/10367:

Restore lost fix:
    http://mail-index.netbsd.org/source-changes/2001/09/09/0042.html

Define ENTIRE_LINE to be -1 instead of 0 since we may want to copy 0 characters.
(and use ENTIRE_LINE instead of 0 where appropriate)

This fixes a bug in the dw command with for example:

<cursor>
a b c

~
~
if you hit dw there, only the empty line would be killed but both the empty
line and the subsequent one would be pasted when asked for with P for example.


(christos)

diff -r1.5 -r1.6 src/dist/nvi/common/cut.c

--- src/dist/nvi/common/Attic/cut.c 2011/11/23 19:25:28	1.5
+++ src/dist/nvi/common/Attic/cut.c 2012/01/21 19:32:37	1.6

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cut.c,v 1.5 2011/11/23 19:25:28 tnozaki Exp $ */
+/*	$NetBSD: cut.c,v 1.6 2012/01/21 19:32:37 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
 @@ -124,36 +124,36 @@ copyloop:
 	 */
 	if (cbp == NULL) {
 		CALLOC_RET(sp, cbp, CB *, 1, sizeof(CB));
 		cbp->name = name;
 		CIRCLEQ_INIT(&cbp->textq);
 		LIST_INSERT_HEAD(&sp->wp->cutq, cbp, q);
 	} else if (!append) {
 		text_lfree(&cbp->textq);
 		cbp->len = 0;
 		cbp->flags = 0;
+	}
-#define	ENTIRE_LINE	0
+#define	ENTIRE_LINE	-1
 	/* In line mode, it's pretty easy, just cut the lines. */
 	if (LF_ISSET(CUT_LINEMODE)) {
 		cbp->flags |= CB_LMODE;
 		for (lno = fm->lno; lno <= tm->lno; ++lno)
-			if (cut_line(sp, lno, 0, 0, cbp))
+			if (cut_line(sp, lno, 0, ENTIRE_LINE, cbp))
 				goto cut_line_err;
 	} else {
 		/*
-		 * Get the first line.  A length of 0 causes cut_line
+		 * Get the first line.  A length of ENTIRE_LINE causes cut_line
 		 * to cut from the MARK to the end of the line.
 		 */
 		if (cut_line(sp, fm->lno, fm->cno, fm->lno != tm->lno ?
 		    ENTIRE_LINE : (tm->cno - fm->cno) + 1, cbp))
 			goto cut_line_err;
 		/* Get the intermediate lines. */
 		for (lno = fm->lno; ++lno < tm->lno;)
 			if (cut_line(sp, lno, 0, ENTIRE_LINE, cbp))
 				goto cut_line_err;
 		/* Get the last line. */
 		if (tm->lno != fm->lno &&
 @@ -247,27 +247,27 @@ cut_line(SCR *sp, db_recno_t lno, size_t
 	/* Get the line. */
 	if (db_get(sp, lno, DBG_FATAL, &p, &len))
 		return (1);
 	/* Create a TEXT structure that can hold the entire line. */
 	if ((tp = text_init(sp, NULL, 0, len)) == NULL)
 		return (1);
 	/*
 	 * If the line isn't empty and it's not the entire line,
 	 * copy the portion we want, and reset the TEXT length.
 	 */
 	if (len != 0) {
-		if (clen == 0)
+		if (clen == ENTIRE_LINE)
 			clen = len - fcno;
 		MEMCPYW(tp->lb, p + fcno, clen);
 		tp->len = clen;
+	}
 	/* Append to the end of the cut buffer. */
 	CIRCLEQ_INSERT_TAIL(&cbp->textq, tp, q);
 	cbp->len += tp->len;
 	return (0);
+}
 /*