From owner-svn-src-all@FreeBSD.ORG  Sat Dec 17 15:16:55 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 5D37D106566B;
	Sat, 17 Dec 2011 15:16:55 +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 31E3D8FC15;
	Sat, 17 Dec 2011 15:16:55 +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 pBHFGtIZ064567;
	Sat, 17 Dec 2011 15:16:55 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBHFGsjW064564;
	Sat, 17 Dec 2011 15:16:54 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201112171516.pBHFGsjW064564@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Sat, 17 Dec 2011 15:16:54 +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: r228633 - in head/sys: kern sys
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:16:55 -0000

Author: avg
Date: Sat Dec 17 15:16:54 2011
New Revision: 228633
URL: http://svn.freebsd.org/changeset/base/228633

Log:
  introduce cngets, a method for kernel to read a string from console
  
  This is intended as a replacement for libkern's gets and mostly borrows
  its implementation.  It uses cngrab/cnungrab to delimit kernel's access
  to console input.
  
  Note: libkern's gets obviously doesn't share any bits of implementation
  iwth libc's gets.  They also have different APIs and the former doesn't
  have the overflow problems of the latter.
  
  Inspired by:	bde
  MFC after:	2 months

Modified:
  head/sys/kern/kern_cons.c
  head/sys/sys/cons.h

Modified: head/sys/kern/kern_cons.c
==============================================================================
--- head/sys/kern/kern_cons.c	Sat Dec 17 15:11:22 2011	(r228632)
+++ head/sys/kern/kern_cons.c	Sat Dec 17 15:16:54 2011	(r228633)
@@ -408,6 +408,55 @@ cncheckc(void)
 }
 
 void
+cngets(char *cp, size_t size, int visible)
+{
+	char *lp, *end;
+	int c;
+
+	cngrab();
+
+	lp = cp;
+	end = cp + size - 1;
+	for (;;) {
+		c = cngetc() & 0177;
+		switch (c) {
+		case '\n':
+		case '\r':
+			cnputc(c);
+			*lp = '\0';
+			cnungrab();
+			return;
+		case '\b':
+		case '\177':
+			if (lp > cp) {
+				if (visible) {
+					cnputc(c);
+					cnputs(" \b");
+				}
+				lp--;
+			}
+			continue;
+		case '\0':
+			continue;
+		default:
+			if (lp < end) {
+				switch (visible) {
+				case GETS_NOECHO:
+					break;
+				case GETS_ECHOPASS:
+					cnputc('*');
+					break;
+				default:
+					cnputc(c);
+					break;
+				}
+				*lp++ = c;
+			}
+		}
+	}
+}
+
+void
 cnputc(int c)
 {
 	struct cn_device *cnd;

Modified: head/sys/sys/cons.h
==============================================================================
--- head/sys/sys/cons.h	Sat Dec 17 15:11:22 2011	(r228632)
+++ head/sys/sys/cons.h	Sat Dec 17 15:16:54 2011	(r228633)
@@ -121,6 +121,7 @@ void	cngrab(void);
 void	cnungrab(void);
 int	cncheckc(void);
 int	cngetc(void);
+void	cngets(char *, size_t, int);
 void	cnputc(int);
 void	cnputs(char *);
 int	cnunavailable(void);