svn commit: r228634 - in head/sys: geom/eli kern

[Andriy Gapon]

Author: avg
Date: Sat Dec 17 15:26:34 2011
New Revision: 228634
URL: http://svn.freebsd.org/changeset/base/228634

Log:
  replace uses of libkern gets with cngets
  
  MFC after:	2 months

Modified:
  head/sys/geom/eli/g_eli.c
  head/sys/kern/vfs_mountroot.c

Modified: head/sys/geom/eli/g_eli.c
==============================================================================
--- head/sys/geom/eli/g_eli.c	Sat Dec 17 15:16:54 2011	(r228633)
+++ head/sys/geom/eli/g_eli.c	Sat Dec 17 15:26:34 2011	(r228634)
@@ -29,6 +29,7 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/cons.h>
 #include <sys/kernel.h>
 #include <sys/linker.h>
 #include <sys/module.h>
@@ -1085,7 +1086,7 @@ g_eli_taste(struct g_class *mp, struct g
 		/* Ask for the passphrase if defined. */
 		if (md.md_iterations >= 0) {
 			printf("Enter passphrase for %s: ", pp->name);
-			gets(passphrase, sizeof(passphrase),
+			cngets(passphrase, sizeof(passphrase),
 			    g_eli_visible_passphrase);
 		}
 

Modified: head/sys/kern/vfs_mountroot.c
==============================================================================
--- head/sys/kern/vfs_mountroot.c	Sat Dec 17 15:16:54 2011	(r228633)
+++ head/sys/kern/vfs_mountroot.c	Sat Dec 17 15:26:34 2011	(r228634)
@@ -42,10 +42,10 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/conf.h>
+#include <sys/cons.h>
 #include <sys/fcntl.h>
 #include <sys/jail.h>
 #include <sys/kernel.h>
-#include <sys/libkern.h>
 #include <sys/malloc.h>
 #include <sys/mdioctl.h>
 #include <sys/mount.h>
@@ -486,7 +486,7 @@ parse_dir_ask(char **conf)
 	do {
 		error = EINVAL;
 		printf("\nmountroot> ");
-		gets(name, sizeof(name), GETS_ECHO);
+		cngets(name, sizeof(name), GETS_ECHO);
 		if (name[0] == '\0')
 			break;
 		if (name[0] == '?' && name[1] == '\0') {