d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replace uses of libkern gets with cngets

Browse Source 
MFC after:	2 months
This commit is contained in:
Andriy Gapon 2011-12-17 15:26:34 +00:00
parent 8e62854265
commit f6ce353e58
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/geom/eli/g_eli.c
View File

@ -29,6 +29,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
#include <sys/cons.h>
#include <sys/kernel.h> #include <sys/kernel.h>
#include <sys/linker.h> #include <sys/linker.h>
#include <sys/module.h> #include <sys/module.h>
@ -1085,7 +1086,7 @@ g_eli_taste(struct g_class *mp, struct g_provider *pp, int flags __unused)
/* Ask for the passphrase if defined. */ /* Ask for the passphrase if defined. */
if (md.md_iterations >= 0) { if (md.md_iterations >= 0) {
printf("Enter passphrase for %s: ", pp->name); printf("Enter passphrase for %s: ", pp->name);
gets(passphrase, sizeof(passphrase), cngets(passphrase, sizeof(passphrase),
g_eli_visible_passphrase); g_eli_visible_passphrase);
} }

4
sys/kern/vfs_mountroot.c
View File

@ -42,10 +42,10 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h> #include <sys/param.h>
#include <sys/conf.h> #include <sys/conf.h>
#include <sys/cons.h>
#include <sys/fcntl.h> #include <sys/fcntl.h>
#include <sys/jail.h> #include <sys/jail.h>
#include <sys/kernel.h> #include <sys/kernel.h>
#include <sys/libkern.h>
#include <sys/malloc.h> #include <sys/malloc.h>
#include <sys/mdioctl.h> #include <sys/mdioctl.h>
#include <sys/mount.h> #include <sys/mount.h>
@ -486,7 +486,7 @@ parse_dir_ask(char **conf)
do { do {
error = EINVAL; error = EINVAL;
printf("\nmountroot> "); printf("\nmountroot> ");
gets(name, sizeof(name), GETS_ECHO); cngets(name, sizeof(name), GETS_ECHO);
if (name[0] == '\0') if (name[0] == '\0')
break; break;
if (name[0] == '?' && name[1] == '\0') { if (name[0] == '?' && name[1] == '\0') {