New timing infrastructure. There's a new function schedule_timer()

[u/mdw/putty] / unix / uxcons.c

diff --git a/unix/uxcons.c b/unix/uxcons.c
index c172b0a..a8effe9 100644 (file)
--- a/unix/uxcons.c
+++ b/unix/uxcons.c
@@ -16,6 +16,8 @@
 
 int console_batch_mode = FALSE;
 
+static void *console_logctx = NULL;
+
 /*
  * Clean up and exit.
  */
@@ -29,6 +31,18 @@ void cleanup_exit(int code)
     exit(code);
 }
 
+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)
 {
@@ -37,13 +51,13 @@ void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
     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"
@@ -59,7 +73,7 @@ void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
        "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[] =
@@ -68,7 +82,7 @@ void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
        "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"
@@ -93,18 +107,18 @@ void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
 
     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);
     }
 
@@ -184,7 +198,7 @@ void askcipher(void *frontend, char *ciphername, int cs)
  * 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"
@@ -202,11 +216,11 @@ int askappend(void *frontend, char *filename)
     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);
 
     {
@@ -254,9 +268,15 @@ void old_keyfile_warning(void)
     fputs(message, stderr);
 }
 
-void logevent(void *frontend, char *string)
+void console_provide_logctx(void *logctx)
+{
+    console_logctx = logctx;
+}
+
+void logevent(void *frontend, const char *string)
 {
-    log_eventlog(logctx, string);
+    if (console_logctx)
+       log_eventlog(console_logctx, string);
 }
 
 int console_get_line(const char *prompt, char *str,
@@ -268,6 +288,7 @@ int console_get_line(const char *prompt, char *str,
     if (console_batch_mode) {
        if (maxlen > 0)
            str[0] = '\0';
+       return 0;
     } else {
        tcgetattr(0, &oldmode);
        newmode = oldmode;
@@ -290,8 +311,9 @@ int console_get_line(const char *prompt, char *str,
 
        if (is_pw)
            fputs("\n", stdout);
+
+       return 1;
     }
-    return 1;
 }
 
 void frontend_keypress(void *handle)
@@ -301,3 +323,18 @@ void frontend_keypress(void *handle)
      */
     return;
 }
+
+int is_interactive(void)
+{
+    return isatty(0);
+}
+
+/*
+ * X11-forwarding-related things suitable for console.
+ */
+
+const char platform_x11_best_transport[] = "unix";
+
+char *platform_get_x_display(void) {
+    return dupstr(getenv("DISPLAY"));
+}