[src/netbsd-1-6]: src/usr.sbin/sushi Pull up revision 1.25 (requested by jaro...

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1a23219ff54e
branches:  netbsd-1-6
changeset: 528626:1a23219ff54e
user:      lukem <lukem%NetBSD.org@localhost>
date:      Mon Jul 29 14:52:08 2002 +0000

description:
Pull up revision 1.25 (requested by jaromir in ticket #560):
After showing help, touchwin/wrefresh the stdscr, do not try to do
that for form subwindow, which may be NULL (or is always, even?).
This fixes SIGSEGV when one goes to
Network related configuration -> Modify the hosts file -> Delete host entries
and presses F1 (Help).

diffstat:

 usr.sbin/sushi/scanform.c |  8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diffs (29 lines):

diff -r 55a2539a85e3 -r 1a23219ff54e usr.sbin/sushi/scanform.c
--- a/usr.sbin/sushi/scanform.c Mon Jul 29 14:50:22 2002 +0000
+++ b/usr.sbin/sushi/scanform.c Mon Jul 29 14:52:08 2002 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: scanform.c,v 1.21.2.2 2002/07/29 14:39:55 lukem Exp $       */
+/*      $NetBSD: scanform.c,v 1.21.2.3 2002/07/29 14:52:08 lukem Exp $       */
 
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -408,7 +408,6 @@
 static int 
 my_driver(FORM * form, int c, char *path)
 {
-       WINDOW *subwindow;
        CDKSCROLL *plist;
        CDKSELECTION *slist;
        CDKENTRY *entry;
@@ -483,9 +482,8 @@
        case SHOWHELP:
                if (simple_lang_handler(path, HELPFILE, handle_help) == -2)
                        nohelp();
-               subwindow = form_win(form);
-               touchwin(subwindow);
-               wrefresh(subwindow);
+               touchwin(stdscr);
+               wrefresh(stdscr);
                return(FALSE);
                /* NOTREACHED */
                break;