summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--cli.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 76c61af87..8b32275d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,9 @@
12 - markus@cvs.openbsd.org 2001/02/10 1:33:32 12 - markus@cvs.openbsd.org 2001/02/10 1:33:32
13 [canohost.c] 13 [canohost.c]
14 add debug message, since sshd blocks here if DNS is not available 14 add debug message, since sshd blocks here if DNS is not available
15 - markus@cvs.openbsd.org 2001/02/10 12:44:02
16 [cli.c]
17 don't call vis() for \r
15 18
1620010210 1920010210
17 - (djm) Sync sftp and scp stuff from OpenBSD: 20 - (djm) Sync sftp and scp stuff from OpenBSD:
@@ -3795,4 +3798,4 @@
3795 - Wrote replacements for strlcpy and mkdtemp 3798 - Wrote replacements for strlcpy and mkdtemp
3796 - Released 1.0pre1 3799 - Released 1.0pre1
3797 3800
3798$Id: ChangeLog,v 1.716 2001/02/10 21:39:49 mouring Exp $ 3801$Id: ChangeLog,v 1.717 2001/02/10 21:45:02 mouring Exp $
diff --git a/cli.c b/cli.c
index 6152a810e..52bb34aa0 100644
--- a/cli.c
+++ b/cli.c
@@ -1,5 +1,5 @@
1#include "includes.h" 1#include "includes.h"
2RCSID("$OpenBSD: cli.c,v 1.8 2001/02/08 19:30:51 itojun Exp $"); 2RCSID("$OpenBSD: cli.c,v 1.9 2001/02/10 12:44:02 markus Exp $");
3 3
4#include "xmalloc.h" 4#include "xmalloc.h"
5#include "log.h" 5#include "log.h"
@@ -137,7 +137,7 @@ cli_write(const char* buf, int size)
137 137
138 output = xmalloc(4*size); 138 output = xmalloc(4*size);
139 for (p = output, i = 0; i < size; i++) { 139 for (p = output, i = 0; i < size; i++) {
140 if (buf[i] == '\n') 140 if (buf[i] == '\n' || buf[i] == '\r')
141 *p++ = buf[i]; 141 *p++ = buf[i];
142 else 142 else
143 p = vis(p, buf[i], 0, 0); 143 p = vis(p, buf[i], 0, 0);