[src/netbsd-7]: src/usr.sbin/sysinst Pull up following revision(s) (requested...

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

details:   https://anonhg.NetBSD.org/src/rev/866f8b390739
branches:  netbsd-7
changeset: 798886:866f8b390739
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Jan 23 10:06:30 2015 +0000

description:
Pull up following revision(s) (requested by snj in ticket #445):
        usr.sbin/sysinst/configmenu.c: revision 1.3
Handle empty input gracefully by simply jumping back to the config menu.

diffstat:

 usr.sbin/sysinst/configmenu.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (23 lines):

diff -r eb328a2113ec -r 866f8b390739 usr.sbin/sysinst/configmenu.c
--- a/usr.sbin/sysinst/configmenu.c     Fri Jan 23 09:50:36 2015 +0000
+++ b/usr.sbin/sysinst/configmenu.c     Fri Jan 23 10:06:30 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: configmenu.c,v 1.2 2014/08/03 16:09:38 martin Exp $ */
+/* $NetBSD: configmenu.c,v 1.2.4.1 2015/01/23 10:06:30 martin Exp $ */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -252,10 +252,12 @@
 static int
 add_new_user(struct menudesc *menu, void *arg)
 {
-       char username[STRSIZE];
+       char username[STRSIZE] = "";
        int inwheel=0;
 
        msg_prompt(MSG_addusername, NULL, username, sizeof username -1);
+       if (strlen(username) == 0)
+               return 0;
        process_menu(MENU_yesno, deconst(MSG_addusertowheel));
        inwheel = yesno;
        ushell = "/bin/csh";