diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | clientloop.c | 9 |
2 files changed, 7 insertions, 5 deletions
@@ -10,6 +10,9 @@ | |||
10 | - dtucker@cvs.openbsd.org 2012/09/07 00:30:19 | 10 | - dtucker@cvs.openbsd.org 2012/09/07 00:30:19 |
11 | [clientloop.c] | 11 | [clientloop.c] |
12 | Print '^Z' instead of a raw ^Z when the sequence is not supported. ok djm@ | 12 | Print '^Z' instead of a raw ^Z when the sequence is not supported. ok djm@ |
13 | - dtucker@cvs.openbsd.org 2012/09/07 01:10:21 | ||
14 | [clientloop.c] | ||
15 | Merge escape help text for ~v and ~V; ok djm@ | ||
13 | 16 | ||
14 | 20120906 | 17 | 20120906 |
15 | - (dtucker) OpenBSD CVS Sync | 18 | - (dtucker) OpenBSD CVS Sync |
diff --git a/clientloop.c b/clientloop.c index 20fa4b9f4..3de542814 100644 --- a/clientloop.c +++ b/clientloop.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: clientloop.c,v 1.245 2012/09/07 00:30:19 dtucker Exp $ */ | 1 | /* $OpenBSD: clientloop.c,v 1.246 2012/09/07 01:10:21 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -1014,8 +1014,7 @@ static struct escape_help_text esc_txt[] = { | |||
1014 | {"B", "send a BREAK to the remote system", SUPPRESS_PROTO1}, | 1014 | {"B", "send a BREAK to the remote system", SUPPRESS_PROTO1}, |
1015 | {"C", "open a command line", SUPPRESS_MUXCLIENT}, | 1015 | {"C", "open a command line", SUPPRESS_MUXCLIENT}, |
1016 | {"R", "request rekey", SUPPRESS_PROTO1}, | 1016 | {"R", "request rekey", SUPPRESS_PROTO1}, |
1017 | {"V", "decrease verbosity (LogLevel)", SUPPRESS_MUXCLIENT}, | 1017 | {"V/v", "decrease/increase verbosity (LogLevel)", SUPPRESS_MUXCLIENT}, |
1018 | {"v", "increase verbosity (LogLevel)", SUPPRESS_MUXCLIENT}, | ||
1019 | {"^Z", "suspend ssh", SUPPRESS_MUXCLIENT}, | 1018 | {"^Z", "suspend ssh", SUPPRESS_MUXCLIENT}, |
1020 | {"#", "list forwarded connections", SUPPRESS_NEVER}, | 1019 | {"#", "list forwarded connections", SUPPRESS_NEVER}, |
1021 | {"&", "background ssh (when waiting for connections to terminate)", | 1020 | {"&", "background ssh (when waiting for connections to terminate)", |
@@ -1042,13 +1041,13 @@ print_escape_help(Buffer *b, int escape_char, int protocol2, int mux_client, | |||
1042 | for (i = 0; i < sizeof(esc_txt)/sizeof(esc_txt[0]); i++) { | 1041 | for (i = 0; i < sizeof(esc_txt)/sizeof(esc_txt[0]); i++) { |
1043 | if (esc_txt[i].flags & suppress_flags) | 1042 | if (esc_txt[i].flags & suppress_flags) |
1044 | continue; | 1043 | continue; |
1045 | snprintf(string, sizeof string, " %c%-2s - %s\r\n", | 1044 | snprintf(string, sizeof string, " %c%-3s - %s\r\n", |
1046 | escape_char, esc_txt[i].cmd, esc_txt[i].text); | 1045 | escape_char, esc_txt[i].cmd, esc_txt[i].text); |
1047 | buffer_append(b, string, strlen(string)); | 1046 | buffer_append(b, string, strlen(string)); |
1048 | } | 1047 | } |
1049 | 1048 | ||
1050 | snprintf(string, sizeof string, | 1049 | snprintf(string, sizeof string, |
1051 | " %c%c - send the escape character by typing it twice\r\n" | 1050 | " %c%c - send the escape character by typing it twice\r\n" |
1052 | "(Note that escapes are only recognized immediately after " | 1051 | "(Note that escapes are only recognized immediately after " |
1053 | "newline.)\r\n", escape_char, escape_char); | 1052 | "newline.)\r\n", escape_char, escape_char); |
1054 | buffer_append(b, string, strlen(string)); | 1053 | buffer_append(b, string, strlen(string)); |