From fb109fb5fa5432d9da19a420602d5e353780070d Mon Sep 17 00:00:00 2001
From: wiz <wiz@NetBSD.org>
Date: Sat, 30 Dec 2000 14:46:21 +0000
Subject: [PATCH] Handle NULL return value by fgets after shell prompt better.
 Also improve '\n' slightly. Addresses bin/11847.

---
 sbin/init/init.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/sbin/init/init.c b/sbin/init/init.c
index d7a6febc2abb..e237889fb050 100644
--- a/sbin/init/init.c
+++ b/sbin/init/init.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: init.c,v 1.37 2000/03/19 23:21:46 soren Exp $	*/
+/*	$NetBSD: init.c,v 1.38 2000/12/30 14:46:21 wiz Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -46,7 +46,7 @@ __COPYRIGHT("@(#) Copyright (c) 1991, 1993\n"
 #if 0
 static char sccsid[] = "@(#)init.c	8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: init.c,v 1.37 2000/03/19 23:21:46 soren Exp $");
+__RCSID("$NetBSD: init.c,v 1.38 2000/12/30 14:46:21 wiz Exp $");
 #endif
 #endif /* not lint */
 
@@ -634,9 +634,15 @@ single_user()
 
 #ifdef ALTSHELL
 		fprintf(stderr, "Enter pathname of shell or RETURN for sh: ");
-		fgets(altshell, sizeof(altshell), stdin);
-		/* nuke \n */
-		altshell[strlen(altshell) - 1] = '\0';
+		if (fgets(altshell, sizeof(altshell), stdin) == NULL) {
+			altshell[0] = '\0';
+		} else {
+			/* nuke \n */
+			char *p;
+
+			if ((p = strchr(altshell, '\n')) == NULL)
+				*p = '\0';
+		}
 
 		if (altshell[0])
 			shell = altshell;