[pkgsrc/trunk]: pkgsrc/editors/nvi-m17n - fix a crash with the following seqe...

[yamt <yamt%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bb3f0e617b4a
branches:  trunk
changeset: 472077:bb3f0e617b4a
user:      yamt <yamt%pkgsrc.org@localhost>
date:      Sat Apr 03 17:30:56 2004 +0000

description:
- fix a crash with the following seqence.
  (i've sent the same patch to bostic%bostic.com@localhost a few years ago.)
        % vi a
        :N b
        :q
        :q
- bump to nb2.

diffstat:

 editors/nvi-m17n/Makefile         |   4 ++--
 editors/nvi-m17n/distinfo         |   3 ++-
 editors/nvi-m17n/patches/patch-ae |  22 ++++++++++++++++++++++
 3 files changed, 26 insertions(+), 3 deletions(-)

diffs (56 lines):

diff -r 0a73f7c4d165 -r bb3f0e617b4a editors/nvi-m17n/Makefile
--- a/editors/nvi-m17n/Makefile Sat Apr 03 17:02:55 2004 +0000
+++ b/editors/nvi-m17n/Makefile Sat Apr 03 17:30:56 2004 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2004/01/20 12:14:05 agc Exp $
+# $NetBSD: Makefile,v 1.25 2004/04/03 17:30:56 yamt Exp $
 # FreeBSD Id: Makefile,v 1.11 1999/04/17 10:51:03 itojun Exp
 
 DISTNAME=      nvi-1.79
 PKGNAME=       nvi-m17n-1.79.19991117
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    editors
 MASTER_SITES=  ftp://sleepy.vwh.net/pub/ \
                ftp://ftp.foretune.co.jp/pub/tools/nvi-m17n/
diff -r 0a73f7c4d165 -r bb3f0e617b4a editors/nvi-m17n/distinfo
--- a/editors/nvi-m17n/distinfo Sat Apr 03 17:02:55 2004 +0000
+++ b/editors/nvi-m17n/distinfo Sat Apr 03 17:30:56 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2003/07/16 09:25:05 itojun Exp $
+$NetBSD: distinfo,v 1.5 2004/04/03 17:30:56 yamt Exp $
 
 SHA1 (nvi-1.79.tar.gz) = 65b49768783372609278ecedd63caa8c1547aa2a
 Size (nvi-1.79.tar.gz) = 1295401 bytes
@@ -8,4 +8,5 @@
 SHA1 (patch-ab) = f7a382af11f200467ac994d90e108e97c7602b13
 SHA1 (patch-ac) = 738f4b3d51b6b39f2cc4b2cffeb1a1ea412aed89
 SHA1 (patch-ad) = 21b5df4bb13b248f6f1ffe7ca69d91a4eae83561
+SHA1 (patch-ae) = 9e84570d8afdc7c03f71712b9317fcbcc2fa7006
 SHA1 (patch-global) = 118bfdcefba77c37c07b29d0c68fb8bbf02cb10e
diff -r 0a73f7c4d165 -r bb3f0e617b4a editors/nvi-m17n/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/nvi-m17n/patches/patch-ae Sat Apr 03 17:30:56 2004 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-ae,v 1.1 2004/04/03 17:30:56 yamt Exp $
+
+--- ../common/options.c.orig   Tue Jul  3 22:53:06 2001
++++ ../common/options.c        Tue Jul  3 22:48:27 2001
+@@ -1088,7 +1088,7 @@
+       /* Copy the string edit options. */
+       for (cnt = rval = 0; cnt < O_OPTIONCOUNT; ++cnt) {
+               if (optlist[cnt].type != OPT_STR ||
+-                  F_ISSET(&optlist[cnt], OPT_GLOBAL))
++                  F_ISSET(&sp->opts[cnt], OPT_GLOBAL))
+                       continue;
+               /*
+                * If never set, or already failed, NULL out the entries --
+@@ -1131,7 +1131,7 @@
+ 
+       for (cnt = 0; cnt < O_OPTIONCOUNT; ++cnt) {
+               if (optlist[cnt].type != OPT_STR ||
+-                  F_ISSET(&optlist[cnt], OPT_GLOBAL))
++                  F_ISSET(&sp->opts[cnt], OPT_GLOBAL))
+                       continue;
+               if (O_STR(sp, cnt) != NULL)
+                       free(O_STR(sp, cnt));