Directory changes.

SCCS-vsn: usr.bin/tn3270/sys_curses/termout.c 1.16
SCCS-vsn: usr.bin/tn3270/tools/mkdctype/mkdctype.c 1.3
SCCS-vsn: usr.bin/tn3270/tools/prt3270.c 1.6
SCCS-vsn: usr.bin/tn3270/tools/mkhits/dohits.c 1.8
SCCS-vsn: usr.bin/tn3270/tools/mkastosc/mkastosc.c 1.10
SCCS-vsn: usr.bin/tn3270/tools/mkdstoas/mkdstoas.c 1.6
SCCS-vsn: usr.bin/tn3270/tools/mkhits/mkhits.c 1.6
SCCS-vsn: usr.bin/tn3270/tools/makefile 1.10
SCCS-vsn: usr.bin/tn3270/tools/mkastods/mkastods.c 1.2
SCCS-vsn: usr.bin/tn3270/distribution/utilities/tnrecv.c 1.4

diff --git a/usr/src/usr.bin/tn3270/distribution/utilities/tnrecv.c b/usr/src/usr.bin/tn3270/distribution/utilities/tnrecv.c
index d5f4957..bf16ecb 100644 (file)
--- a/usr/src/usr.bin/tn3270/distribution/utilities/tnrecv.c
+++ b/usr/src/usr.bin/tn3270/distribution/utilities/tnrecv.c
@@ -1,6 +1,7 @@
 #include <stdio.h>
 
 #include <stdio.h>
 

-#include "apilib.h"
+#include <apilib/apilib.h>
+

 #include "tncomp.h"
 
 
 #include "tncomp.h"
 
 

diff --git a/usr/src/usr.bin/tn3270/sys_curses/termout.c b/usr/src/usr.bin/tn3270/sys_curses/termout.c
index 75c7804..e0f833e 100644 (file)
--- a/usr/src/usr.bin/tn3270/sys_curses/termout.c
+++ b/usr/src/usr.bin/tn3270/sys_curses/termout.c
@@ -37,7 +37,7 @@ static        char    sccsid[] = "@(#)outbound.c      3.1  10/29/86";
 
 #include "../telnet.ext"
 
 
 #include "../telnet.ext"
 

-#include "../ascii/disp_asc.h"
+#include "../apilib/disp_asc.h"

 
 #include "../ctlr/hostctlr.h"
 #include "../ctlr/inbound.ext"
 
 #include "../ctlr/hostctlr.h"
 #include "../ctlr/inbound.ext"

diff --git a/usr/src/usr.bin/tn3270/tools/makefile b/usr/src/usr.bin/tn3270/tools/makefile
index cfd58c5..85a419a 100644 (file)
--- a/usr/src/usr.bin/tn3270/tools/makefile
+++ b/usr/src/usr.bin/tn3270/tools/makefile
@@ -31,44 +31,41 @@ tools:
 all:   ${ALLEXE}
        @echo done.
 
 all:   ${ALLEXE}
        @echo done.
 

-prt3270:       prt3270.o ../general/globals.o ../ascii/ebctab.o \
-                               ../ascii/astosc.o ../ctlr/kbd.out
+prt3270:       prt3270.o ../general/globals.o ../apilib/asc_ebc.o \
+                               ../apilib/astosc.o ../ctlr/kbd.out

        ${CC} ${CFLAGS} -o prt3270 prt3270.o ../general/globals.o \
        ${CC} ${CFLAGS} -o prt3270 prt3270.o ../general/globals.o \

-                                       ../ascii/ebctab.o ../ascii/astosc.o
+                                       ../apilib/asc_ebc.o ../apilib/astosc.o

 
 

-mkastosc:      mkastosc.o dohits.o ../ascii/asctab.o ../ctlr/ebc_disp.o
+mkastosc:      mkastosc.o dohits.o ../apilib/asc_ebc.o ../apilib/ebc_disp.o

        $(CC) $(CFLAGS) -o mkastosc mkastosc.o dohits.o \
        $(CC) $(CFLAGS) -o mkastosc mkastosc.o dohits.o \

-                       ../ascii/asctab.o ../ctlr/ebc_disp.o
+                       ../apilib/asc_ebc.o ../apilib/ebc_disp.o

 
 

-mkastods:      mkastods.o ../ascii/asctab.o ../ctlr/ebc_disp.o
-       $(CC) $(CFLAGS) -o mkastods mkastods.o ../ascii/asctab.o \
-                                               ../ctlr/ebc_disp.o
+mkastods:      mkastods.o ../apilib/asc_ebc.o ../apilib/ebc_disp.o
+       $(CC) $(CFLAGS) -o mkastods mkastods.o ../apilib/asc_ebc.o \
+                                               ../apilib/ebc_disp.o

 
 

-mkdstoas:      mkdstoas.o ../ascii/ebctab.o ../ctlr/ebc_disp.o
-       $(CC) $(CFLAGS) -o mkdstoas mkdstoas.o ../ascii/ebctab.o \
-                                               ../ctlr/ebc_disp.o
+mkdstoas:      mkdstoas.o ../apilib/asc_ebc.o ../apilib/ebc_disp.o
+       $(CC) $(CFLAGS) -o mkdstoas mkdstoas.o ../apilib/asc_ebc.o \
+                                               ../apilib/ebc_disp.o

 
 

-mkhits:        mkhits.o dohits.o ../ascii/asctab.o ../ctlr/ebc_disp.o
-       $(CC) $(CFLAGS) -o mkhits mkhits.o dohits.o ../ascii/asctab.o \
-                                               ../ctlr/ebc_disp.o
+mkhits:        mkhits.o dohits.o ../apilib/asc_ebc.o ../apilib/ebc_disp.o
+       $(CC) $(CFLAGS) -o mkhits mkhits.o dohits.o ../apilib/asc_ebc.o \
+                                               ../apilib/ebc_disp.o

 
 

-mkdctype:      mkdctype.o ../ctlr/ebc_disp.o ectype.o
-       $(CC) $(CFLAGS) -o mkdctype mkdctype.o ../ctlr/ebc_disp.o ectype.o
+mkdctype:      mkdctype.o ../apilib/ebc_disp.o ectype.o
+       $(CC) $(CFLAGS) -o mkdctype mkdctype.o ../apilib/ebc_disp.o ectype.o

 
 

-../ascii/astosc.o:
-       (cd ../ascii; make astosc.o)
+../apilib/astosc.o:
+       (cd ../apilib; make astosc.o)

 
 

-../ascii/ebctab.o:
-       (cd ../ascii; make ebctab.o)
+../apilib/asc_ebc.o:
+       (cd ../apilib; make asc_ebc.o)

 
 ../ctlr/kbd.out:
        (cd ../ctlr; make kbd.out)
 
 
 ../ctlr/kbd.out:
        (cd ../ctlr; make kbd.out)
 

-../ctlr/ebc_disp.o:
-       (cd ../ctlr; make ebc_disp.o)
-
-../ascii/asctab.o:
-       (cd ../ascii; make asctab.o)
+../apilib/ebc_disp.o:
+       (cd ../apilib; make ebc_disp.o)

 
 ../general/globals.o:
        (cd ../general; make globals.o)
 
 ../general/globals.o:
        (cd ../general; make globals.o)


@@ -88,6 +85,8 @@ action:
 
 clean:
        -rm errs makefile.bak ${ALLO} ${ALLEXE}
 
 clean:
        -rm errs makefile.bak ${ALLO} ${ALLEXE}

+       sccs clean
+       -sccs get makefile

 
 lint:
        lint ${LINTFLAGS} ${INCLUDES} ${DEFINES} -DTN3270 \
 
 lint:
        lint ${LINTFLAGS} ${INCLUDES} ${DEFINES} -DTN3270 \


@@ -115,14 +114,14 @@ depend:
 
 # DO NOT DELETE THIS LINE
 
 
 # DO NOT DELETE THIS LINE
 

-dohits.o: ../general/general.h ../ascii/ascebc.h ../ctlr/ebc_disp.h
+dohits.o: ../general/general.h ../apilib/asc_ebc.h ../apilib/ebc_disp.h

 dohits.o: ../ctlr/function.h dohits.h
 ectype.o: ectype.h
 dohits.o: ../ctlr/function.h dohits.h
 ectype.o: ectype.h

-mkastosc.o: ../general/general.h ../ascii/ascebc.h
-mkastosc.o: ../ctlr/ebc_disp.h ../ctlr/function.h dohits.h
-mkdctype.o: ../ctlr/ebc_disp.h ectype.h
-mkastods.o: ../ascii/ascebc.h ../ctlr/ebc_disp.h
-mkdstoas.o: ../ascii/ascebc.h ../ctlr/ebc_disp.h
-mkhits.o: ../ascii/ascebc.h ../ctlr/ebc_disp.h ../ctlr/function.h dohits.h
-prt3270.o: ../general/general.h ../ascii/ascebc.h ../ctlr/hostctlr.h
-prt3270.o: ../ctlr/screen.h ../general/globals.h
+mkastods.o: ../apilib/asc_ebc.h ../apilib/ebc_disp.h
+mkastosc.o: ../general/general.h ../ctlr/function.h dohits.h
+mkdctype.o: ../apilib/ebc_disp.h ectype.h
+mkdstoas.o: ../apilib/asc_ebc.h ../apilib/ebc_disp.h
+mkhits.o: ../ctlr/function.h dohits.h
+prt3270.o: ../general/general.h ../apilib/asc_ebc.h ../ctlr/hostctlr.h
+prt3270.o: ../ctlr/screen.h ../ctlr/function.h ../apilib/astosc.h
+prt3270.o: ../general/globals.h ../ctlr/kbd.out

diff --git a/usr/src/usr.bin/tn3270/tools/mkastods/mkastods.c b/usr/src/usr.bin/tn3270/tools/mkastods/mkastods.c
index 0589807..e68a81b 100644 (file)
--- a/usr/src/usr.bin/tn3270/tools/mkastods/mkastods.c
+++ b/usr/src/usr.bin/tn3270/tools/mkastods/mkastods.c
@@ -5,8 +5,8 @@
 #include <string.h>
 #endif /* defined(unix) */
 #include <ctype.h>
 #include <string.h>
 #endif /* defined(unix) */
 #include <ctype.h>

-#include "../ascii/ascebc.h"
-#include "../ctlr/ebc_disp.h"
+#include "../apilib/asc_ebc.h"
+#include "../apilib/ebc_disp.h"

 
 
 int
 
 
 int


@@ -21,7 +21,7 @@ main()
        if ((i%8) == 0) {
            printf("\n");
        }
        if ((i%8) == 0) {
            printf("\n");
        }

-       printf("\t0x%02x,", ebc_disp[ascebc[0][i]]);
+       printf("\t0x%02x,", ebc_disp[asc_ebc[i]]);

     }
     for (i = sizeof disp_ebc; i < 256; i++) {
        if ((i%8) == 0) {
     }
     for (i = sizeof disp_ebc; i < 256; i++) {
        if ((i%8) == 0) {

diff --git a/usr/src/usr.bin/tn3270/tools/mkastosc/mkastosc.c b/usr/src/usr.bin/tn3270/tools/mkastosc/mkastosc.c
index 38bf1f3..fd4b85f 100644 (file)
--- a/usr/src/usr.bin/tn3270/tools/mkastosc/mkastosc.c
+++ b/usr/src/usr.bin/tn3270/tools/mkastosc/mkastosc.c
@@ -8,8 +8,6 @@
 #include <ctype.h>
 
 #include "../general/general.h"
 #include <ctype.h>
 
 #include "../general/general.h"

-#include "../ascii/ascebc.h"
-#include "../ctlr/ebc_disp.h"

 #include "../ctlr/function.h"
 
 #include "dohits.h"
 #include "../ctlr/function.h"
 
 #include "dohits.h"

diff --git a/usr/src/usr.bin/tn3270/tools/mkdctype/mkdctype.c b/usr/src/usr.bin/tn3270/tools/mkdctype/mkdctype.c
index 9d9d4ca..28d9e0f 100644 (file)
--- a/usr/src/usr.bin/tn3270/tools/mkdctype/mkdctype.c
+++ b/usr/src/usr.bin/tn3270/tools/mkdctype/mkdctype.c
@@ -1,4 +1,4 @@
-#include "../ctlr/ebc_disp.h"
+#include "../apilib/ebc_disp.h"

 #include "ectype.h"
 
 
 #include "ectype.h"
 
 

diff --git a/usr/src/usr.bin/tn3270/tools/mkdstoas/mkdstoas.c b/usr/src/usr.bin/tn3270/tools/mkdstoas/mkdstoas.c
index 9b79f16..3fabfab 100644 (file)
--- a/usr/src/usr.bin/tn3270/tools/mkdstoas/mkdstoas.c
+++ b/usr/src/usr.bin/tn3270/tools/mkdstoas/mkdstoas.c
@@ -5,8 +5,8 @@
 #include <string.h>
 #endif /* defined(unix) */
 #include <ctype.h>
 #include <string.h>
 #endif /* defined(unix) */
 #include <ctype.h>

-#include "../ascii/ascebc.h"
-#include "../ctlr/ebc_disp.h"
+#include "../apilib/asc_ebc.h"
+#include "../apilib/ebc_disp.h"

 
 
 int
 
 
 int


@@ -21,7 +21,7 @@ main()
        if ((i%8) == 0) {
            printf("\n");
        }
        if ((i%8) == 0) {
            printf("\n");
        }

-       printf("\t0x%02x,", ebcasc[0][disp_ebc[i]]);
+       printf("\t0x%02x,", ebc_asc[disp_ebc[i]]);

     }
     for (i = sizeof disp_ebc; i < 256; i++) {
        if ((i%8) == 0) {
     }
     for (i = sizeof disp_ebc; i < 256; i++) {
        if ((i%8) == 0) {

diff --git a/usr/src/usr.bin/tn3270/tools/mkhits/dohits.c b/usr/src/usr.bin/tn3270/tools/mkhits/dohits.c
index c3fc50c..7d2ce2d 100644 (file)
--- a/usr/src/usr.bin/tn3270/tools/mkhits/dohits.c
+++ b/usr/src/usr.bin/tn3270/tools/mkhits/dohits.c
@@ -24,8 +24,8 @@
 #endif /* defined(unix) */
 #include <ctype.h>
 #include "../general/general.h"
 #endif /* defined(unix) */
 #include <ctype.h>
 #include "../general/general.h"

-#include "../ascii/ascebc.h"
-#include "../ctlr/ebc_disp.h"
+#include "../apilib/asc_ebc.h"
+#include "../apilib/ebc_disp.h"

 #include "../ctlr/function.h"
 
 #include "dohits.h"
 #include "../ctlr/function.h"
 
 #include "dohits.h"


@@ -169,7 +169,7 @@ struct Hits *hits;
     }
     if (type[1] == 0) {                /* character */
        hit->ctlrfcn = FCN_CHARACTER;
     }
     if (type[1] == 0) {                /* character */
        hit->ctlrfcn = FCN_CHARACTER;

-       hit->code = ebc_disp[ascebc[AE_IN][type[0]]];
+       hit->code = ebc_disp[asc_ebc[type[0]]];

        return savechr(*type);          /* The character is the name */
     } else {
        for (this = firstentry(type); this; this = this->next) {
        return savechr(*type);          /* The character is the name */
     } else {
        for (this = firstentry(type); this; this = this->next) {

diff --git a/usr/src/usr.bin/tn3270/tools/mkhits/mkhits.c b/usr/src/usr.bin/tn3270/tools/mkhits/mkhits.c
index d454464..e85322b 100644 (file)
--- a/usr/src/usr.bin/tn3270/tools/mkhits/mkhits.c
+++ b/usr/src/usr.bin/tn3270/tools/mkhits/mkhits.c
@@ -23,8 +23,6 @@
 #include <string.h>
 #endif /* defined(unix) */
 #include <ctype.h>
 #include <string.h>
 #endif /* defined(unix) */
 #include <ctype.h>

-#include "../ascii/ascebc.h"
-#include "../ctlr/ebc_disp.h"

 #include "../ctlr/function.h"
 
 #include "dohits.h"
 #include "../ctlr/function.h"
 
 #include "dohits.h"

diff --git a/usr/src/usr.bin/tn3270/tools/prt3270.c b/usr/src/usr.bin/tn3270/tools/prt3270.c
index 12d06ff..55254af 100644 (file)
--- a/usr/src/usr.bin/tn3270/tools/prt3270.c
+++ b/usr/src/usr.bin/tn3270/tools/prt3270.c
@@ -10,11 +10,11 @@ static      char    sccsid[] = "@(#)prt3270.c       3.1  10/29/86";
 
 #include "../general/general.h"
 
 
 #include "../general/general.h"
 

-#include "../ascii/ascebc.h"
+#include "../apilib/asc_ebc.h"

 #include "../ctlr/hostctlr.h"
 #include "../ctlr/screen.h"
 #include "../ctlr/function.h"
 #include "../ctlr/hostctlr.h"
 #include "../ctlr/screen.h"
 #include "../ctlr/function.h"

-#include "../ascii/astosc.h"
+#include "../apilib/astosc.h"

 #include "../general/globals.h"
 
 #include "../ctlr/kbd.out"
 #include "../general/globals.h"
 
 #include "../ctlr/kbd.out"


@@ -149,7 +149,7 @@ void
 putEChar(character)
 int character;
 {
 putEChar(character)
 int character;
 {

-    putChar(ebcasc[0][character]);
+    putChar(ebc_asc[character]);

     if (ColsLeft() < 10) {
        Column1();
     }
     if (ColsLeft() < 10) {
        Column1();
     }