From owner-svn-src-all@FreeBSD.ORG  Sat Dec 17 15:26:35 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6AED91065673;
	Sat, 17 Dec 2011 15:26:35 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 59EB18FC1B;
	Sat, 17 Dec 2011 15:26:35 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pBHFQZls064895;
	Sat, 17 Dec 2011 15:26:35 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBHFQZaR064892;
	Sat, 17 Dec 2011 15:26:35 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201112171526.pBHFQZaR064892@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Sat, 17 Dec 2011 15:26:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r228634 - in head/sys: geom/eli kern
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 17 Dec 2011 15:26:35 -0000

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') {