[PATCH 2/2] telnetd: Map CRLF to CR

Sebastian Huber sebastian.huber at embedded-brains.de
Mon Aug 20 13:12:25 UTC 2012


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');
-- 
1.7.7




More information about the devel mailing list