projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mac_pollterm() is no longer useful and can be retired.
[u/mdw/putty]
/
unix
/
uxcons.c
diff --git
a/unix/uxcons.c
b/unix/uxcons.c
index
3ed7ebf
..
b5bf840
100644
(file)
--- a/
unix/uxcons.c
+++ b/
unix/uxcons.c
@@
-35,6
+35,14
@@
void update_specials_menu(void *frontend)
{
}
{
}
+void notify_remote_exit(void *frontend)
+{
+}
+
+void timer_change_notify(long next)
+{
+}
+
void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
char *keystr, char *fingerprint)
{
void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
char *keystr, char *fingerprint)
{
@@
-135,18
+143,17
@@
void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
}
/*
}
/*
- * Ask whether the selected
cipher
is acceptable (since it was
+ * Ask whether the selected
algorithm
is acceptable (since it was
* below the configured 'warn' threshold).
* below the configured 'warn' threshold).
- * cs: 0 = both ways, 1 = client->server, 2 = server->client
*/
*/
-void ask
cipher(void *frontend, char *ciphername, int cs
)
+void ask
alg(void *frontend, const char *algtype, const char *algname
)
{
static const char msg[] =
{
static const char msg[] =
- "The first %s
cipher
supported by the server is\n"
+ "The first %s supported by the server is\n"
"%s, which is below the configured warning threshold.\n"
"Continue with connection? (y/n) ";
static const char msg_batch[] =
"%s, which is below the configured warning threshold.\n"
"Continue with connection? (y/n) ";
static const char msg_batch[] =
- "The first %s
cipher
supported by the server is\n"
+ "The first %s supported by the server is\n"
"%s, which is below the configured warning threshold.\n"
"Connection abandoned.\n";
static const char abandoned[] = "Connection abandoned.\n";
"%s, which is below the configured warning threshold.\n"
"Connection abandoned.\n";
static const char abandoned[] = "Connection abandoned.\n";
@@
-154,17
+161,11
@@
void askcipher(void *frontend, char *ciphername, int cs)
char line[32];
if (console_batch_mode) {
char line[32];
if (console_batch_mode) {
- fprintf(stderr, msg_batch,
- (cs == 0) ? "" :
- (cs == 1) ? "client-to-server " : "server-to-client ",
- ciphername);
+ fprintf(stderr, msg_batch, algtype, algname);
cleanup_exit(1);
}
cleanup_exit(1);
}
- fprintf(stderr, msg,
- (cs == 0) ? "" :
- (cs == 1) ? "client-to-server " : "server-to-client ",
- ciphername);
+ fprintf(stderr, msg, algtype, algname);
fflush(stderr);
{
fflush(stderr);
{
@@
-280,6
+281,7
@@
int console_get_line(const char *prompt, char *str,
if (console_batch_mode) {
if (maxlen > 0)
str[0] = '\0';
if (console_batch_mode) {
if (maxlen > 0)
str[0] = '\0';
+ return 0;
} else {
tcgetattr(0, &oldmode);
newmode = oldmode;
} else {
tcgetattr(0, &oldmode);
newmode = oldmode;
@@
-302,8
+304,9
@@
int console_get_line(const char *prompt, char *str,
if (is_pw)
fputs("\n", stdout);
if (is_pw)
fputs("\n", stdout);
+
+ return 1;
}
}
- return 1;
}
void frontend_keypress(void *handle)
}
void frontend_keypress(void *handle)