Add in some changes from Dave Borman (borman@monet).

SCCS-vsn: usr.bin/telnet/sys_bsd.c 1.6
SCCS-vsn: usr.bin/telnet/tn3270.c 1.5
SCCS-vsn: usr.bin/telnet/telnet.c 5.24
SCCS-vsn: usr.bin/telnet/fdset.h 1.2

diff --git a/usr/src/usr.bin/telnet/sys_bsd.c b/usr/src/usr.bin/telnet/sys_bsd.c
index e02b5ec..497cf12 100644 (file)
--- a/usr/src/usr.bin/telnet/sys_bsd.c
+++ b/usr/src/usr.bin/telnet/sys_bsd.c
@@ -14,24 +14,12 @@
 
 #include "ring.h"
 
 
 #include "ring.h"
 

+#include "fdset.h"
+

 #include "defines.h"
 #include "externs.h"
 #include "types.h"
 
 #include "defines.h"
 #include "externs.h"
 #include "types.h"
 

-#ifndef        FD_SETSIZE
-/*
- * The following is defined just in case someone should want to run
- * this telnet on a 4.2 system.
- *
- */
-
-#define        FD_SET(n, p)    ((p)->fds_bits[0] |= (1<<(n)))
-#define        FD_CLR(n, p)    ((p)->fds_bits[0] &= ~(1<<(n)))
-#define        FD_ISSET(n, p)  ((p)->fds_bits[0] & (1<<(n)))
-#define FD_ZERO(p)     ((p)->fds_bits[0] = 0)
-
-#endif
-

 int
        tout,                   /* Output file descriptor */
        tin,                    /* Input file descriptor */
 int
        tout,                   /* Output file descriptor */
        tin,                    /* Input file descriptor */

diff --git a/usr/src/usr.bin/telnet/telnet.c b/usr/src/usr.bin/telnet/telnet.c
index e14596b..3a86850 100644 (file)
--- a/usr/src/usr.bin/telnet/telnet.c
+++ b/usr/src/usr.bin/telnet/telnet.c
@@ -403,7 +403,7 @@ telrcv()
            if (c == '\0') {
                break;  /* Ignore \0 after CR */
            } else if (c == '\n') {
            if (c == '\0') {
                break;  /* Ignore \0 after CR */
            } else if (c == '\n') {

-               if (hisopts[TELOPT_ECHO] && !crmod) {
+               if ((!hisopts[TELOPT_ECHO]) && !crmod) {

                    TTYADD(c);
                }
                break;
                    TTYADD(c);
                }
                break;

diff --git a/usr/src/usr.bin/telnet/tn3270.c b/usr/src/usr.bin/telnet/tn3270.c
index b5bb8ae..2dc7381 100644 (file)
--- a/usr/src/usr.bin/telnet/tn3270.c
+++ b/usr/src/usr.bin/telnet/tn3270.c
@@ -1,3 +1,5 @@
+#include "fdset.h"
+

 void
 tn3270_init()
 {
 void
 tn3270_init()
 {