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

diff --git a/usr/src/usr.bin/tn3270/tools/mkastosc/mkastosc.c b/usr/src/usr.bin/tn3270/tools/mkastosc/mkastosc.c
index 8973ef6..dbd1fbb 100644 (file)
--- 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 <stdio.h>

-#include <string.h>
+#include <strings.h>

 #include <ctype.h>
 
 #define        LETS_SEE_ASCII
 #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 */
        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;
                }
                    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 d8b2d3f..55f6675 100644 (file)
--- 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 <stdio.h>

-#include <string.h>
+#include <strings.h>

 #include <ctype.h>
 #include "../ascii/ascebc.h"
 #include "../ctlr/ebc_disp.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 ce596a8..ac5dd50 100644 (file)
--- 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 <stdio.h>

-#include <string.h>
+#include <strings.h>

 #include <ctype.h>
 #include "../ascii/ascebc.h"
 #include "../ctlr/ebc_disp.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 4ca070e..ee93972 100644 (file)
--- 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 <stdio.h>

-#include <string.h>
+#include <strings.h>

 #include <ctype.h>
 #include "../ascii/ascebc.h"
 #include "../ctlr/ebc_disp.h"
 #include <ctype.h>
 #include "../ascii/ascebc.h"
 #include "../ctlr/ebc_disp.h"