find: support -HLP

[oweals/busybox.git] / networking / telnet.c

diff --git a/networking/telnet.c b/networking/telnet.c
index 7081a6a41ba95e1f2191a73e3ccd92fe6f2f4a38..a255797737ef7aaafb041525c5a141d73764bbb6 100644 (file)
--- a/networking/telnet.c
+++ b/networking/telnet.c
@@ -125,12 +125,10 @@ static void subneg(byte c);
 
 static void iac_flush(void)
 {
-       write(netfd, G.iacbuf, G.iaclen);
+       full_write(netfd, G.iacbuf, G.iaclen);
        G.iaclen = 0;
 }
 
-#define write_str(fd, str) write(fd, str, sizeof(str) - 1)
-
 static void doexit(int ev) NORETURN;
 static void doexit(int ev)
 {
@@ -145,7 +143,7 @@ static void con_escape(void)
        if (bb_got_signal) /* came from line mode... go raw */
                rawmode();
 
-       write_str(1, "\r\nConsole escape. Commands are:\r\n\n"
+       full_write1_str("\r\nConsole escape. Commands are:\r\n\n"
                        " l     go to line mode\r\n"
                        " c     go to character mode\r\n"
                        " z     suspend telnet\r\n"
@@ -176,7 +174,7 @@ static void con_escape(void)
                doexit(EXIT_SUCCESS);
        }
 
-       write_str(1, "continuing...\r\n");
+       full_write1_str("continuing...\r\n");
 
        if (bb_got_signal)
                cookmode();
@@ -187,27 +185,34 @@ static void con_escape(void)
 static void handle_net_output(int len)
 {
        byte outbuf[2 * DATABUFSIZE];
-       byte *p = (byte*)G.buf;
-       int j = 0;
+       byte *dst = outbuf;
+       byte *src = (byte*)G.buf;
+       byte *end = src + len;
 
-       for (; len > 0; len--, p++) {
-               byte c = *p;
+       while (src < end) {
+               byte c = *src++;
                if (c == 0x1d) {
                        con_escape();
                        return;
                }
-               outbuf[j++] = c;
+               *dst = c;
                if (c == IAC)
-                       outbuf[j++] = c; /* IAC -> IAC IAC */
-               else if (c == '\r')
-                       /* See RFC 1123 3.3.1 Telnet End-of-Line Convention.
+                       *++dst = c; /* IAC -> IAC IAC */
+               else
+               if (c == '\r' || c == '\n') {
+                       /* Enter key sends '\r' in raw mode and '\n' in cooked one.
+                        *
+                        * See RFC 1123 3.3.1 Telnet End-of-Line Convention.
                         * Using CR LF instead of other allowed possibilities
                         * like CR NUL - easier to talk to HTTP/SMTP servers.
                         */
-                       outbuf[j++] = '\n'; /* CR -> CR LF */
+                       *dst = '\r'; /* Enter -> CR LF */
+                       *++dst = '\n';
+               }
+               dst++;
        }
-       if (j > 0)
-               full_write(netfd, outbuf, j);
+       if (dst - outbuf != 0)
+               full_write(netfd, outbuf, dst - outbuf);
 }
 
 static void handle_net_input(int len)
@@ -376,30 +381,31 @@ static void put_iac_naws(byte c, int x, int y)
        put_iac(SB);
        put_iac(c);
 
-       put_iac((x >> 8) & 0xff);
-       put_iac(x & 0xff);
-       put_iac((y >> 8) & 0xff);
-       put_iac(y & 0xff);
+       /* "... & 0xff" implicitly done below */
+       put_iac(x >> 8);
+       put_iac(x);
+       put_iac(y >> 8);
+       put_iac(y);
 
        put_iac(IAC);
        put_iac(SE);
 }
 #endif
 
-static char const escapecharis[] ALIGN1 = "\r\nEscape character is ";
-
 static void setConMode(void)
 {
        if (G.telflags & UF_ECHO) {
                if (G.charmode == CHM_TRY) {
                        G.charmode = CHM_ON;
-                       printf("\r\nEntering character mode%s'^]'.\r\n", escapecharis);
+                       printf("\r\nEntering %s mode"
+                               "\r\nEscape character is '^%c'.\r\n", "character", ']');
                        rawmode();
                }
        } else {
                if (G.charmode != CHM_OFF) {
                        G.charmode = CHM_OFF;
-                       printf("\r\nEntering line mode%s'^C'.\r\n", escapecharis);
+                       printf("\r\nEntering %s mode"
+                               "\r\nEscape character is '^%c'.\r\n", "line", 'C');
                        cookmode();
                }
        }