Various fixes. No copy string yet, though.

[unix-history] / usr / src / usr.bin / tn3270 / telnet.c

diff --git a/usr/src/usr.bin/tn3270/telnet.c b/usr/src/usr.bin/tn3270/telnet.c
index 0a9cd71..a2a7bca 100644 (file)
--- a/usr/src/usr.bin/tn3270/telnet.c
+++ b/usr/src/usr.bin/tn3270/telnet.c
@@ -117,13 +117,13 @@ extern char       *inet_ntoa();
 
 #if    defined(TN3270)
 #include "ctlr/screen.h"
 
 #if    defined(TN3270)
 #include "ctlr/screen.h"

-#include "system/globals.h"
+#include "general/globals.h"

 #include "telnet.ext"
 #include "ctlr/options.ext"
 #include "ctlr/outbound.ext"
 #include "telnet.ext"
 #include "ctlr/options.ext"
 #include "ctlr/outbound.ext"

-#include "keyboard/termin.ext"
+#include "ascii/termin.ext"

 #endif /* defined(TN3270) */
 #endif /* defined(TN3270) */

-#include "general.h"
+#include "general/general.h"

 
 
 
 
 
 


@@ -610,6 +610,7 @@ int fd;
 #if    defined(MSDOS)
 #include <time.h>
 #include <signal.h>
 #if    defined(MSDOS)
 #include <time.h>
 #include <signal.h>

+#include <process.h>

 
 #if    !defined(SO_OOBINLINE)
 #define        SO_OOBINLINE
 
 #if    !defined(SO_OOBINLINE)
 #define        SO_OOBINLINE


@@ -787,11 +788,20 @@ inputExists()
     if (lineend) {
        return 1;
     }
     if (lineend) {
        return 1;
     }

-    if (!kbhit()) {
+#if    1       /* For BIOS variety of calls */
+    if (kbhit() == 0) {

        return lineend;
     }
     input = getch();                   /* MSC - get console character */
        return lineend;
     }
     input = getch();                   /* MSC - get console character */

-#if    0       /* For BIOS variety of calls */
+    if ((input&0xff) == 0) {
+       DoNextChar(0x01);               /* ^A */
+    } else {
+       DoNextChar(input&0xff);
+    }
+#else  /* 0 */
+    if ((input = dirconio()) == -1) {
+       return lineend;
+    }

     if ((input&0xff) == 0) {
        if ((input&0xff00) == 0x0300) {         /* Null */
            DoNextChar(0);
     if ((input&0xff) == 0) {
        if ((input&0xff00) == 0x0300) {         /* Null */
            DoNextChar(0);


@@ -808,11 +818,6 @@ inputExists()
        DoNextChar(input&0xff);
     }
 #endif /* 0 */
        DoNextChar(input&0xff);
     }
 #endif /* 0 */

-    if ((input&0xff) == 0) {
-       DoNextChar(0x01);               /* ^A */
-    } else {
-       DoNextChar(input&0xff);
-    }

     return lineend;
 }
 
     return lineend;
 }
 


@@ -825,7 +830,7 @@ CtrlCInterrupt()
        signal(SIGINT, CtrlCInterrupt);
     } else {
        closeallsockets();
        signal(SIGINT, CtrlCInterrupt);
     } else {
        closeallsockets();

-       exit();
+       exit(1);

     }
 }
 \f
     }
 }
 \f


@@ -3493,6 +3498,7 @@ settranscom(argc, argv)
 #endif /* defined(TN3270) && defined(unix) */
 
 
 #endif /* defined(TN3270) && defined(unix) */
 
 

+

 static
 tn(argc, argv)
        int argc;
 static
 tn(argc, argv)
        int argc;


@@ -3624,7 +3630,6 @@ static char
        openhelp[] =    "connect to a site",
        closehelp[] =   "close current connection",
        quithelp[] =    "exit telnet",
        openhelp[] =    "connect to a site",
        closehelp[] =   "close current connection",
        quithelp[] =    "exit telnet",

-       zhelp[] =       "suspend telnet",

        statushelp[] =  "print status information",
        helphelp[] =    "print help information",
        sendhelp[] =    "transmit special characters ('send ?' for more)",
        statushelp[] =  "print status information",
        helphelp[] =    "print help information",
        sendhelp[] =    "transmit special characters ('send ?' for more)",


@@ -3634,9 +3639,15 @@ static char
 #if    defined(TN3270) && defined(unix)
        transcomhelp[] = "specify Unix command for transparent mode pipe",
 #endif /* defined(TN3270) && defined(unix) */
 #if    defined(TN3270) && defined(unix)
        transcomhelp[] = "specify Unix command for transparent mode pipe",
 #endif /* defined(TN3270) && defined(unix) */

+#if    defined(unix)
+       zhelp[] =       "suspend telnet",
+#endif /* defined(unix */
+#if    defined(MSDOS)
+       shellhelp[] =   "invoke a subshell",
+#endif /* defined(MSDOS) */

        modehelp[] = "try to enter line-by-line or character-at-a-time mode";
 
        modehelp[] = "try to enter line-by-line or character-at-a-time mode";
 

-extern int     help();
+extern int     help(), shell();

 
 static struct cmd cmdtab[] = {
        { "close",      closehelp,      bye,            1, 1 },
 
 static struct cmd cmdtab[] = {
        { "close",      closehelp,      bye,            1, 1 },


@@ -3651,7 +3662,12 @@ static struct cmd cmdtab[] = {
 #if    defined(TN3270) && defined(unix)
        { "transcom",   transcomhelp,   settranscom,    1, 0 },
 #endif /* defined(TN3270) && defined(unix) */
 #if    defined(TN3270) && defined(unix)
        { "transcom",   transcomhelp,   settranscom,    1, 0 },
 #endif /* defined(TN3270) && defined(unix) */

+#if    defined(unix)

        { "z",          zhelp,          suspend,        1, 0 },
        { "z",          zhelp,          suspend,        1, 0 },

+#endif /* defined(unix) */
+#if    defined(MSDOS)
+       { "!",          shellhelp,      shell,          1, 0 },
+#endif /* defined(MSDOS) */

        { "?",          helphelp,       help,           1, 0 },
        0
 };
        { "?",          helphelp,       help,           1, 0 },
        0
 };