Module Name: src Committed By: martin Date: Fri Apr 8 15:53:44 UTC 2011
Modified Files: src/distrib/utils/sysinst: main.c menus.mi Log Message: Make all curses/$TERM related failures exit with error code 4 (everything else in here only exits successfully or with error 1), so we can react accordingly in the surrounding script. Part of fixing PR 44738. To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 src/distrib/utils/sysinst/main.c cvs rdiff -u -r1.40 -r1.41 src/distrib/utils/sysinst/menus.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/distrib/utils/sysinst/main.c diff -u src/distrib/utils/sysinst/main.c:1.58 src/distrib/utils/sysinst/main.c:1.59 --- src/distrib/utils/sysinst/main.c:1.58 Mon Apr 4 08:30:12 2011 +++ src/distrib/utils/sysinst/main.c Fri Apr 8 15:53:44 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.58 2011/04/04 08:30:12 mbalmer Exp $ */ +/* $NetBSD: main.c,v 1.59 2011/04/08 15:53:44 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -137,7 +137,7 @@ if (!getenv("TERM")) { (void)fprintf(stderr, "sysinst: environment variable TERM not set.\n"); - exit(1); + exit(4); } /* argv processing */ @@ -164,7 +164,7 @@ /* initialize message window */ if (menu_init()) { __menu_initerror(); - exit(1); + exit(4); } /* Index: src/distrib/utils/sysinst/menus.mi diff -u src/distrib/utils/sysinst/menus.mi:1.40 src/distrib/utils/sysinst/menus.mi:1.41 --- src/distrib/utils/sysinst/menus.mi:1.40 Tue Feb 1 01:42:07 2011 +++ src/distrib/utils/sysinst/menus.mi Fri Apr 8 15:53:44 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: menus.mi,v 1.40 2011/02/01 01:42:07 joerg Exp $ */ +/* $NetBSD: menus.mi,v 1.41 2011/04/08 15:53:44 martin Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -65,7 +65,11 @@ allow dynamic menus; allow dynamic messages; - +error action { + fprintf (stderr, "Could not initialize menu system, please check " + "your terminal type.\n"); + exit(4); +}; menu selfskind, title MSG_Select_the_type, exitstring MSG_unchanged, y=6, x=30; display action {