\r and \n must be distinguished in some cases (telnet); netbsd pr#2969;

darcy@druid.com

diff --git a/libexec/uucpd/uucpd.c b/libexec/uucpd/uucpd.c
index 237eeb1..69f6884 100644 (file)
--- a/libexec/uucpd/uucpd.c
+++ b/libexec/uucpd/uucpd.c
@@ -42,7 +42,7 @@ char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)uucpd.c    5.10 (Berkeley) 2/26/91";*/
-static char rcsid[] = "$Id: uucpd.c,v 1.5 1996/10/26 04:59:20 millert Exp $";
+static char rcsid[] = "$Id: uucpd.c,v 1.6 1996/12/03 01:29:54 deraadt Exp $";
 #endif /* not lint */
 
 /*
@@ -221,11 +221,12 @@ register int n;
                if (read(0, &c, 1) <= 0)
                        return(-1);
                c &= 0177;
-               if (c == '\n' || c == '\r') {
+               if (c == '\r') {
                        *p = '\0';
                        return(0);
                }
-               *p++ = c;
+               if (c != '\n')
+                       *p++ = c;
        }
        return(-1);
 }