summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
authoryokota <yokota@FreeBSD.org>1998-08-06 09:44:23 +0000
committeryokota <yokota@FreeBSD.org>1998-08-06 09:44:23 +0000
commit2701f369f2be0c7345c5fde356674fd0fb18de20 (patch)
treec3a14afab300b9278a376de5ca7ffb4b26e36e4b /usr.sbin
parenta90f51195aac4c0aeb53796dfaf8a568408b9b8c (diff)
downloadFreeBSD-src-2701f369f2be0c7345c5fde356674fd0fb18de20.zip
FreeBSD-src-2701f369f2be0c7345c5fde356674fd0fb18de20.tar.gz
The control code ^_ (0x1f) should really be called "us" rather than "ns".
In the mean time, accept both "us" and "ns" in the keymap file as ^_ for the compatibility with the existing keymap files.
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/kbdcontrol/kbdcontrol.c4
-rw-r--r--usr.sbin/kbdcontrol/lex.l3
2 files changed, 4 insertions, 3 deletions
diff --git a/usr.sbin/kbdcontrol/kbdcontrol.c b/usr.sbin/kbdcontrol/kbdcontrol.c
index dffc8df..bd02828 100644
--- a/usr.sbin/kbdcontrol/kbdcontrol.c
+++ b/usr.sbin/kbdcontrol/kbdcontrol.c
@@ -28,7 +28,7 @@
#ifndef lint
static const char rcsid[] =
- "$Id: kbdcontrol.c,v 1.15 1998/08/03 09:12:39 yokota Exp $";
+ "$Id: kbdcontrol.c,v 1.16 1998/08/03 11:33:22 yokota Exp $";
#endif /* not lint */
#include <ctype.h>
@@ -45,7 +45,7 @@ char ctrl_names[32][4] = {
"nul", "soh", "stx", "etx", "eot", "enq", "ack", "bel",
"bs ", "ht ", "nl ", "vt ", "ff ", "cr ", "so ", "si ",
"dle", "dc1", "dc2", "dc3", "dc4", "nak", "syn", "etb",
- "can", "em ", "sub", "esc", "fs ", "gs ", "rs ", "ns "
+ "can", "em ", "sub", "esc", "fs ", "gs ", "rs ", "us "
};
char acc_names[15][5] = {
diff --git a/usr.sbin/kbdcontrol/lex.l b/usr.sbin/kbdcontrol/lex.l
index e84d069..01ca536 100644
--- a/usr.sbin/kbdcontrol/lex.l
+++ b/usr.sbin/kbdcontrol/lex.l
@@ -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: lex.l,v 1.6 1998/01/07 08:43:28 yokota Exp $
+ * $Id: lex.l,v 1.7 1998/08/03 11:33:22 yokota Exp $
*/
%{
@@ -93,6 +93,7 @@ FS|fs { number = 28; return TNUM; }
GS|gs { number = 29; return TNUM; }
RS|rs { number = 30; return TNUM; }
NS|ns { number = 31; return TNUM; }
+US|us { number = 31; return TNUM; }
SP|sp { number = 32; return TNUM; }
DEL|del { number = 127; return TNUM; }
OpenPOWER on IntegriCloud