Merge RELENG_2_0_5 into HEAD

2 files changed, 12 insertions, 9 deletions

diff --git a/usr.sbin/kbdcontrol/kbdcontrol.1 b/usr.sbin/kbdcontrol/kbdcontrol.1
index 40c31d1d3ed6..0c33da51847f 100644
--- a/usr.sbin/kbdcontrol/kbdcontrol.1
+++ b/usr.sbin/kbdcontrol/kbdcontrol.1
@@ -30,13 +30,12 @@ characteristics etc.
 .TP
 The following command line options are supported.
 .TP
-.BI "\-b\ " [ duration.pitch ]
+.BI "\-b\ " [ duration.pitch | normal | visual ]
 Set the bell duration and pitch values. Argument may also be one of 
 .BI "normal"
 which set sound parameters back to normal values, or 
 .BI "visual"
 which set the bell to visual mode, ie flashes the screen instead.
-
 .TP
 .BI "\-r\ " [ delay.repeat | slow | fast | normal ]
 Set keyboard
@@ -66,8 +65,11 @@ to send
 .BI "\-F\ "
 Set function keys back to the standard definitions.
 .TP
-.B \-v
-Turns on verbose output.
+.B "\-x "
+Use hexadecimal numbers in keyboard map dump.
+.TP
+.BI "\-h " #
+Set history buffer size (in lines).
 .PP
 .SH FILES
 /usr/share/syscons/keymaps
@@ -76,6 +78,6 @@ Report when found.
 .SH "SEE ALSO"
 .BR vidcontrol (1) ,
 .BR keyboard (4) ,
-.BR screen (4) ,
+.BR screen (4) .
 .SH AUTHORS
 Søren Schmidt (sos@FreeBSD.org)
diff --git a/usr.sbin/kbdcontrol/kbdcontrol.c b/usr.sbin/kbdcontrol/kbdcontrol.c
index 7e1d6b756b62..ecaf6c20f664 100644
--- a/usr.sbin/kbdcontrol/kbdcontrol.c
+++ b/usr.sbin/kbdcontrol/kbdcontrol.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: kbdcontrol.c,v 1.5 1995/01/30 21:41:10 sos Exp $
+ *	$Id: kbdcontrol.c,v 1.6.2.1 1995/06/05 09:23:13 davidg Exp $
  */
 
 #include <ctype.h>
@@ -54,11 +54,11 @@ char fkey_table[96][MAXFK] = {
 /* 33-36 */	"\033[s", "\033[t", "\033[u", "\033[v",
 /* 37-40 */	"\033[w", "\033[x", "\033[y", "\033[z",
 /* 41-44 */	"\033[@", "\033[[", "\033[\\","\033[]",
-/* 45-48 */     "\033[^", "\033[_", "\033[`", "\033[",
+/* 45-48 */     "\033[^", "\033[_", "\033[`", "\033[{",
 /* 49-52 */	"\033[H", "\033[A", "\033[I", "-"     ,
 /* 53-56 */	"\033[D", "\033[E", "\033[C", "+"     ,
 /* 57-60 */	"\033[F", "\033[B", "\033[G", "\033[L",
-/* 61-64 */	"\033[J", "\033[K", "\033[}", ""      ,
+/* 61-64 */     "\177",   "\033[J", "\033[~", "\033[}",
 /* 65-68 */	""      , ""      , ""      , ""      ,
 /* 69-72 */	""      , ""      , ""      , ""      ,
 /* 73-76 */	""      , ""      , ""      , ""      ,
@@ -283,7 +283,7 @@ print_entry(FILE *fp, int value)
 				fprintf(fp, " %s   ", ctrl_names[val]);
 			else if (val == 127)
 				fprintf(fp, " del   ");
-			else if (isprint(val))
+			else if (isascii(val) && isprint(val))
 				fprintf(fp, " '%c'   ", val);
 			else if (hex)
 				fprintf(fp, " 0x%02x  ", val);
@@ -537,6 +537,7 @@ usage()
 "                  -r slow             (set keyboard delay & repeat to slow)\n"
 "                  -r normal           (set keyboard delay & repeat to normal)\n"
 "                  -r fast             (set keyboard delay & repeat to fast)\n"
+"                  -x                  (use hexadecimal numbers in -d option)\n"
 	);
 }