int console_batch_mode = FALSE;
+static void *console_logctx = NULL;
+
/*
* Clean up and exit.
*/
* Clean up.
*/
sk_cleanup();
-
- if (cfg.protocol == PROT_SSH)
- random_save_seed();
-
+ random_save_seed();
exit(code);
}
+void update_specials_menu(void *frontend)
+{
+}
+
void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
char *keystr, char *fingerprint)
{
static const char absentmsg_batch[] =
"The server's host key is not cached. You have no guarantee\n"
"that the server is the computer you think it is.\n"
- "The server's key fingerprint is:\n"
+ "The server's %s key fingerprint is:\n"
"%s\n"
"Connection abandoned.\n";
static const char absentmsg[] =
"The server's host key is not cached. You have no guarantee\n"
"that the server is the computer you think it is.\n"
- "The server's key fingerprint is:\n"
+ "The server's %s key fingerprint is:\n"
"%s\n"
"If you trust this host, enter \"y\" to add the key to\n"
"PuTTY's cache and carry on connecting.\n"
"cached. This means that either the server administrator\n"
"has changed the host key, or you have actually connected\n"
"to another computer pretending to be the server.\n"
- "The new key fingerprint is:\n"
+ "The new %s key fingerprint is:\n"
"%s\n"
"Connection abandoned.\n";
static const char wrongmsg[] =
"cached. This means that either the server administrator\n"
"has changed the host key, or you have actually connected\n"
"to another computer pretending to be the server.\n"
- "The new key fingerprint is:\n"
+ "The new %s key fingerprint is:\n"
"%s\n"
"If you were expecting this change and trust the new key,\n"
"enter \"y\" to update PuTTY's cache and continue connecting.\n"
if (ret == 2) { /* key was different */
if (console_batch_mode) {
- fprintf(stderr, wrongmsg_batch, fingerprint);
+ fprintf(stderr, wrongmsg_batch, keytype, fingerprint);
cleanup_exit(1);
}
- fprintf(stderr, wrongmsg, fingerprint);
+ fprintf(stderr, wrongmsg, keytype, fingerprint);
fflush(stderr);
}
if (ret == 1) { /* key was absent */
if (console_batch_mode) {
- fprintf(stderr, absentmsg_batch, fingerprint);
+ fprintf(stderr, absentmsg_batch, keytype, fingerprint);
cleanup_exit(1);
}
- fprintf(stderr, absentmsg, fingerprint);
+ fprintf(stderr, absentmsg, keytype, fingerprint);
fflush(stderr);
}
* Ask whether to wipe a session log file before writing to it.
* Returns 2 for wipe, 1 for append, 0 for cancel (don't log).
*/
-int askappend(void *frontend, char *filename)
+int askappend(void *frontend, Filename filename)
{
static const char msgtemplate[] =
"The session log file \"%.*s\" already exists.\n"
char line[32];
if (console_batch_mode) {
- fprintf(stderr, msgtemplate_batch, FILENAME_MAX, filename);
+ fprintf(stderr, msgtemplate_batch, FILENAME_MAX, filename.path);
fflush(stderr);
return 0;
}
- fprintf(stderr, msgtemplate, FILENAME_MAX, filename);
+ fprintf(stderr, msgtemplate, FILENAME_MAX, filename.path);
fflush(stderr);
{
fputs(message, stderr);
}
-void logevent(void *frontend, char *string)
+void console_provide_logctx(void *logctx)
{
- log_eventlog(logctx, string);
+ console_logctx = logctx;
+}
+
+void logevent(void *frontend, const char *string)
+{
+ if (console_logctx)
+ log_eventlog(console_logctx, string);
}
int console_get_line(const char *prompt, char *str,
*/
return;
}
+
+int is_interactive(void)
+{
+ return isatty(0);
+}