Module Name: src
Committed By: christos
Date: Fri Jan 27 16:41:23 UTC 2012
Modified Files:
src/dist/nvi/common: common.h cut.c delete.c
src/dist/nvi/ex: ex_move.c
Log Message:
PR/45881: Chavdar Ivanov: nvi copy command copies empty lines.
Move ENTIRE_LINE definition to common.h and have interested parties use it.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/dist/nvi/common/common.h
cvs rdiff -u -r1.8 -r1.9 src/dist/nvi/common/cut.c
cvs rdiff -u -r1.5 -r1.6 src/dist/nvi/common/delete.c
cvs rdiff -u -r1.1.1.2 -r1.2 src/dist/nvi/ex/ex_move.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/nvi/common/common.h
diff -u src/dist/nvi/common/common.h:1.2 src/dist/nvi/common/common.h:1.3
--- src/dist/nvi/common/common.h:1.2 Tue May 20 13:38:19 2008
+++ src/dist/nvi/common/common.h Fri Jan 27 11:41:22 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: common.h,v 1.2 2008/05/20 17:38:19 aymeric Exp $ */
+/* $NetBSD: common.h,v 1.3 2012/01/27 16:41:22 christos Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -85,6 +85,7 @@ typedef enum { LOCK_FAILED, LOCK_SUCCESS
/* Sequence types. */
typedef enum { SEQ_ABBREV, SEQ_COMMAND, SEQ_INPUT } seq_t;
+#define ENTIRE_LINE ((size_t)-1)
/*
* Local includes.
*/
Index: src/dist/nvi/common/cut.c
diff -u src/dist/nvi/common/cut.c:1.8 src/dist/nvi/common/cut.c:1.9
--- src/dist/nvi/common/cut.c:1.8 Sat Jan 21 14:56:46 2012
+++ src/dist/nvi/common/cut.c Fri Jan 27 11:41:22 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cut.c,v 1.8 2012/01/21 19:56:46 christos Exp $ */
+/* $NetBSD: cut.c,v 1.9 2012/01/27 16:41:22 christos Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -134,7 +134,6 @@ copyloop:
}
-#define ENTIRE_LINE (size_t)-1
/* In line mode, it's pretty easy, just cut the lines. */
if (LF_ISSET(CUT_LINEMODE)) {
cbp->flags |= CB_LMODE;
Index: src/dist/nvi/common/delete.c
diff -u src/dist/nvi/common/delete.c:1.5 src/dist/nvi/common/delete.c:1.6
--- src/dist/nvi/common/delete.c:1.5 Sat Jan 21 14:49:56 2012
+++ src/dist/nvi/common/delete.c Fri Jan 27 11:41:22 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: delete.c,v 1.5 2012/01/21 19:49:56 christos Exp $ */
+/* $NetBSD: delete.c,v 1.6 2012/01/27 16:41:22 christos Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -65,7 +65,7 @@ del(SCR *sp, MARK *fm, MARK *tm, int lmo
if (tm->lno == lno) {
if (db_get(sp, lno, DBG_FATAL, &p, &len))
return (1);
- eof = tm->cno != (size_t)-1 && tm->cno >= len ? 1 : 0;
+ eof = tm->cno != ENTIRE_LINE && tm->cno >= len ? 1 : 0;
} else
eof = 1;
if (eof) {
Index: src/dist/nvi/ex/ex_move.c
diff -u src/dist/nvi/ex/ex_move.c:1.1.1.2 src/dist/nvi/ex/ex_move.c:1.2
--- src/dist/nvi/ex/ex_move.c:1.1.1.2 Sun May 18 10:31:16 2008
+++ src/dist/nvi/ex/ex_move.c Fri Jan 27 11:41:22 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ex_move.c,v 1.1.1.2 2008/05/18 14:31:16 aymeric Exp $ */
+/* $NetBSD: ex_move.c,v 1.2 2012/01/27 16:41:22 christos Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -54,7 +54,7 @@ ex_copy(SCR *sp, EXCMD *cmdp)
memset(&cb, 0, sizeof(cb));
CIRCLEQ_INIT(&cb.textq);
for (cnt = fm1.lno; cnt <= fm2.lno; ++cnt)
- if (cut_line(sp, cnt, 0, 0, &cb)) {
+ if (cut_line(sp, cnt, 0, ENTIRE_LINE, &cb)) {
rval = 1;
goto err;
}
