Changes in startup order to ensure any subsystem which might attempt

[PuTTY.git] / unix / uxcons.c

diff --git a/unix/uxcons.c b/unix/uxcons.c
index 3c79ad63446081df5424f8edf7f784721ab2bb7b..a8effe9003a0c81a8b77b7cfa8091d0e6654789f 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)
 {
@@ -280,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;
@@ -302,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)
@@ -318,3 +328,13 @@ 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"));
+}