From 577b1ba98153bf30baf579398de628865d847bc0 Mon Sep 17 00:00:00 2001
From: Gregory Minshall <minshall@ucbvax.Berkeley.EDU>
Date: Sun, 10 May 1987 18:41:35 -0800
Subject: [PATCH] Strings.h (sigh) and a small bug.

SCCS-vsn: usr.bin/tn3270/tools/mkhits/dohits.c 1.5
SCCS-vsn: usr.bin/tn3270/tools/mkastosc/mkastosc.c 1.4
SCCS-vsn: usr.bin/tn3270/tools/mkdstoas/mkdstoas.c 1.3
SCCS-vsn: usr.bin/tn3270/tools/mkhits/mkhits.c 1.4
---
 usr/src/usr.bin/tn3270/tools/mkastosc/mkastosc.c | 4 ++--
 usr/src/usr.bin/tn3270/tools/mkdstoas/mkdstoas.c | 2 +-
 usr/src/usr.bin/tn3270/tools/mkhits/dohits.c     | 2 +-
 usr/src/usr.bin/tn3270/tools/mkhits/mkhits.c     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/usr/src/usr.bin/tn3270/tools/mkastosc/mkastosc.c b/usr/src/usr.bin/tn3270/tools/mkastosc/mkastosc.c
index 8973ef6c7b..dbd1fbb2a3 100644
--- a/usr/src/usr.bin/tn3270/tools/mkastosc/mkastosc.c
+++ b/usr/src/usr.bin/tn3270/tools/mkastosc/mkastosc.c
@@ -17,7 +17,7 @@
  */
 
 #include <stdio.h>
-#include <string.h>
+#include <strings.h>
 #include <ctype.h>
 
 #define	LETS_SEE_ASCII
@@ -83,7 +83,7 @@ char	*argv[];
 	for (i = 0; i < 4; i++) {
 	    if (ph->hit[i].ctlrfcn == FCN_CHARACTER) {
 		c = Ph->name[i][0];	/* "name" of this one */
-		if (tbl[c].shift[0] == 0) {
+		if ((tbl[c].shift == 0) || (tbl[c].shift[0] == 0)) {
 		    tbl[c].shift = shiftof[i];
 		    tbl[c].scancode = scancode;
 		}
diff --git a/usr/src/usr.bin/tn3270/tools/mkdstoas/mkdstoas.c b/usr/src/usr.bin/tn3270/tools/mkdstoas/mkdstoas.c
index d8b2d3f45b..55f6675622 100644
--- a/usr/src/usr.bin/tn3270/tools/mkdstoas/mkdstoas.c
+++ b/usr/src/usr.bin/tn3270/tools/mkdstoas/mkdstoas.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include <string.h>
+#include <strings.h>
 #include <ctype.h>
 #include "../ascii/ascebc.h"
 #include "../ctlr/ebc_disp.h"
diff --git a/usr/src/usr.bin/tn3270/tools/mkhits/dohits.c b/usr/src/usr.bin/tn3270/tools/mkhits/dohits.c
index ce596a8d33..ac5dd502fb 100644
--- a/usr/src/usr.bin/tn3270/tools/mkhits/dohits.c
+++ b/usr/src/usr.bin/tn3270/tools/mkhits/dohits.c
@@ -17,7 +17,7 @@
  */
 
 #include <stdio.h>
-#include <string.h>
+#include <strings.h>
 #include <ctype.h>
 #include "../ascii/ascebc.h"
 #include "../ctlr/ebc_disp.h"
diff --git a/usr/src/usr.bin/tn3270/tools/mkhits/mkhits.c b/usr/src/usr.bin/tn3270/tools/mkhits/mkhits.c
index 4ca070ea75..ee93972d3e 100644
--- a/usr/src/usr.bin/tn3270/tools/mkhits/mkhits.c
+++ b/usr/src/usr.bin/tn3270/tools/mkhits/mkhits.c
@@ -17,7 +17,7 @@
  */
 
 #include <stdio.h>
-#include <string.h>
+#include <strings.h>
 #include <ctype.h>
 #include "../ascii/ascebc.h"
 #include "../ctlr/ebc_disp.h"
-- 
2.20.1