[src/netbsd-1-6]: src/usr.sbin/sushi Pullup rev 1.11-1.12 (requested by marti...

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

details:   https://anonhg.NetBSD.org/src/rev/f2113946b8e4
branches:  netbsd-1-6
changeset: 531206:f2113946b8e4
user:      jmc <jmc%NetBSD.org@localhost>
date:      Mon Mar 29 05:35:41 2004 +0000

description:
Pullup rev 1.11-1.12 (requested by martin in ticket #1638)

Don't report curses initialization failure using curses.

diffstat:

 usr.sbin/sushi/sushi.c |  23 +++++++++++------------
 1 files changed, 11 insertions(+), 12 deletions(-)

diffs (44 lines):

diff -r 223a8b3db1c2 -r f2113946b8e4 usr.sbin/sushi/sushi.c
--- a/usr.sbin/sushi/sushi.c    Sun Mar 28 22:24:24 2004 +0000
+++ b/usr.sbin/sushi/sushi.c    Mon Mar 29 05:35:41 2004 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: sushi.c,v 1.9 2001/02/20 23:57:50 cgd Exp $       */
+/*      $NetBSD: sushi.c,v 1.9.2.1 2004/03/29 05:35:41 jmc Exp $       */
 
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -86,6 +86,16 @@
        else
                lang_id = strdup(getenv("LANG"));
 
+       if (initscr() == NULL)
+               errx(1, "%s", "Cannot initialize curses");
+               
+       cdkscreen = initCDKScreen(stdscr);
+
+       ioctl(0, TIOCGWINSZ, &ws);
+
+       initCDKColor();
+       raw();
+
        parse_config();
        tree_init();
        i = 0;
@@ -103,17 +113,6 @@
                }
        }
 
-       if (initscr() == NULL)
-               bailout("%s", catgets(catalog, 1, 22,
-                   "Cannot initialize curses"));
-               
-       cdkscreen = initCDKScreen(stdscr);
-
-       ioctl(0, TIOCGWINSZ, &ws);
-
-       initCDKColor();
-       raw();
-
        if (mte == NULL)
                navigate_menu(cqMenuHeadp, "sushi_topmenu", 
                    catgets(catalog, 4, 5, "<C></5>Sushi\n\n"));