Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle NULL return value by fgets after shell prompt better. Also 

improve '\n' slightly. Addresses bin/11847.
This commit is contained in:
wiz 2000-12-30 14:46:21 +00:00
parent 26d86ec404
commit fb109fb5fa
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sbin/init/init.c
View File

@ -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;