Merge branch 'busybox' into merge

2 files changed, 21 insertions, 4 deletions

diff --git a/libbb/Config.src b/libbb/Config.src
index fdf8bbb28..16e16480b 100644
--- a/libbb/Config.src
+++ b/libbb/Config.src
@@ -76,6 +76,18 @@ config FEATURE_ETC_NETWORKS
         a rarely used feature which allows you to use names
         instead of IP/mask pairs in route command.
 
+config FEATURE_ETC_SERVICES
+        bool "Consult /etc/services even for well-known ports"
+        default n
+        help
+        Look up e.g. "telnet" and "http" in /etc/services file
+        instead of assuming ports 23 and 80.
+        This is almost never necessary (everybody uses standard ports),
+        and it makes sense to avoid reading this file.
+        If you disable this option, in the cases where port is explicitly
+        specified as a service name (e.g. "telnet HOST PORTNAME"),
+        it will still be looked up in /etc/services.
+
 config FEATURE_EDITING
         bool "Command line editing"
         default y
diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c
index 6fa21ad00..57bda6204 100644
--- a/libbb/xfuncs.c
+++ b/libbb/xfuncs.c
@@ -333,7 +333,6 @@ int FAST_FUNC get_termios_and_make_raw(int fd, struct termios *newterm, struct t
         newterm->c_cc[VMIN] = 1;
         /* no timeout (reads block forever) */
         newterm->c_cc[VTIME] = 0;
-        if (flags & TERMIOS_RAW_CRNL) {
 /* IXON, IXOFF, and IXANY:
  * IXOFF=1: sw flow control is enabled on input queue:
  * tty transmits a STOP char when input queue is close to full
@@ -343,9 +342,12 @@ int FAST_FUNC get_termios_and_make_raw(int fd, struct termios *newterm, struct t
  * and resume sending if START is received, or if any char
  * is received and IXANY=1.
  */
+        if (flags & TERMIOS_RAW_CRNL_INPUT) {
                 /* IXON=0: XON/XOFF chars are treated as normal chars (why we do this?) */
                 /* dont convert CR to NL on input */
                 newterm->c_iflag &= ~(IXON | ICRNL);
+        }
+        if (flags & TERMIOS_RAW_CRNL_OUTPUT) {
                 /* dont convert NL to CR+NL on output */
                 newterm->c_oflag &= ~(ONLCR);
                 /* Maybe clear more c_oflag bits? Usually, only OPOST and ONLCR are set.
@@ -366,9 +368,12 @@ int FAST_FUNC get_termios_and_make_raw(int fd, struct termios *newterm, struct t
 #ifndef IXANY
 # define IXANY 0
 #endif
-                /* IXOFF=0: disable sending XON/XOFF if input buf is full */
-                /* IXON=0: input XON/XOFF chars are not special */
-                /* dont convert anything on input */
+                /* IXOFF=0: disable sending XON/XOFF if input buf is full
+                 * IXON=0: input XON/XOFF chars are not special
+                 * BRKINT=0: dont send SIGINT on break
+                 * IMAXBEL=0: dont echo BEL on input line too long
+                 * INLCR,ICRNL,IUCLC: dont convert anything on input
+                 */
                 newterm->c_iflag &= ~(IXOFF|IXON|IXANY|BRKINT|INLCR|ICRNL|IUCLC|IMAXBEL);
         }
         return r;