tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-31 01:35:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

- dtucker@cvs.openbsd.org 2012/09/07 00:30:19

Browse Source 
[clientloop.c]
     Print '^Z' instead of a raw ^Z when the sequence is not supported.  ok djm@
This commit is contained in:
Darren Tucker 2012-09-07 11:21:42 +10:00
parent 83d0af6907
commit f111d40604
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -7,6 +7,9 @@
- jmc@cvs.openbsd.org 2012/09/06 13:57:42 - jmc@cvs.openbsd.org 2012/09/06 13:57:42
[ssh.1] [ssh.1]
missing letter in previous; missing letter in previous;
- dtucker@cvs.openbsd.org 2012/09/07 00:30:19
[clientloop.c]
Print '^Z' instead of a raw ^Z when the sequence is not supported. ok djm@
20120906 20120906
- (dtucker) OpenBSD CVS Sync - (dtucker) OpenBSD CVS Sync

11
clientloop.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: clientloop.c,v 1.244 2012/09/06 09:50:13 dtucker Exp $ */ /* $OpenBSD: clientloop.c,v 1.245 2012/09/07 00:30:19 dtucker Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -1114,11 +1114,16 @@ process_escapes(Channel *c, Buffer *bin, Buffer *bout, Buffer *berr,
case 'Z' - 64: case 'Z' - 64:
/* XXX support this for mux clients */ /* XXX support this for mux clients */
if (c && c->ctl_chan != -1) { if (c && c->ctl_chan != -1) {
char b[16];
noescape: noescape:
if (ch == 'Z' - 64)
snprintf(b, sizeof b, "^Z");
else
snprintf(b, sizeof b, "%c", ch);
snprintf(string, sizeof string, snprintf(string, sizeof string,
"%c%c escape not available to " "%c%s escape not available to "
"multiplexed sessions\r\n", "multiplexed sessions\r\n",
escape_char, ch); escape_char, b);
buffer_append(berr, string, buffer_append(berr, string,
strlen(string)); strlen(string));
continue; continue;