[rtems commit] telnetd: Map CRLF to CR

[Sebastian Huber]

Module:    rtems
Branch:    master
Commit:    90e2026b99d27819429cccadeffd0f41d92601a9
Changeset: http://git.rtems.org/rtems/commit/?id=90e2026b99d27819429cccadeffd0f41d92601a9

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Mon Aug 20 14:43:16 2012 +0200

telnetd: Map CRLF to CR

It is not so easy to use Termios for that.  We already map CRNUL to CR,
thus we cannot ignore CRs.  We could change the shell code to map CRNL
to a single line end, but this is more intrusive than the change here.

---

 cpukit/telnetd/pty.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/cpukit/telnetd/pty.c b/cpukit/telnetd/pty.c
index 9d3e48f..30bfe98 100644
--- a/cpukit/telnetd/pty.c
+++ b/cpukit/telnetd/pty.c
@@ -306,10 +306,9 @@ static int read_pty(int minor)
            } else {
               result=value;
               if ( 0
-#if 0               /* pass CRLF through - they should use termios to handle it */
-                 ||  ((value=='\n') && (pty->last_cr))
-#endif
-                /* but map telnet CRNUL to CR down here */
+                /* map CRLF to CR for symmetry */
+                 || ((value=='\n') && pty->last_cr)
+                /* map telnet CRNUL to CR down here */
                  || ((value==0) && pty->last_cr)
                 ) result=-1;
                pty->last_cr=(value=='\r');