- markus@cvs.openbsd.org 2001/02/10 12:44:02
[cli.c]
don't call vis() for \r
diff --git a/ChangeLog b/ChangeLog
index 76c61af..8b32275 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,9 @@
- markus@cvs.openbsd.org 2001/02/10 1:33:32
[canohost.c]
add debug message, since sshd blocks here if DNS is not available
+ - markus@cvs.openbsd.org 2001/02/10 12:44:02
+ [cli.c]
+ don't call vis() for \r
20010210
- (djm) Sync sftp and scp stuff from OpenBSD:
@@ -3795,4 +3798,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.716 2001/02/10 21:39:49 mouring Exp $
+$Id: ChangeLog,v 1.717 2001/02/10 21:45:02 mouring Exp $
diff --git a/cli.c b/cli.c
index 6152a81..52bb34a 100644
--- a/cli.c
+++ b/cli.c
@@ -1,5 +1,5 @@
#include "includes.h"
-RCSID("$OpenBSD: cli.c,v 1.8 2001/02/08 19:30:51 itojun Exp $");
+RCSID("$OpenBSD: cli.c,v 1.9 2001/02/10 12:44:02 markus Exp $");
#include "xmalloc.h"
#include "log.h"
@@ -137,7 +137,7 @@
output = xmalloc(4*size);
for (p = output, i = 0; i < size; i++) {
- if (buf[i] == '\n')
+ if (buf[i] == '\n' || buf[i] == '\r')
*p++ = buf[i];
else
p = vis(p, buf[i], 0, 0);