X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/d0cb8c0cb0002d4750cb0bd14f07f4c606a118a2..2916fa1404c5e3661440f174c3d3fa06c3482aad:/unix/uxplink.c?ds=inline

diff --git a/unix/uxplink.c b/unix/uxplink.c
index 755f1b2b..735d297b 100644
--- a/unix/uxplink.c
+++ b/unix/uxplink.c
@@ -13,7 +13,10 @@
 #include <termios.h>
 #include <pwd.h>
 #include <sys/ioctl.h>
+#include <sys/time.h>
+#ifndef HAVE_NO_SYS_SELECT_H
 #include <sys/select.h>
+#endif
 
 #define PUTTY_DO_GLOBALS	       /* actually _define_ globals */
 #include "putty.h"
@@ -391,6 +394,25 @@ int from_backend(void *frontend_handle, int is_stderr,
     return osize + esize;
 }
 
+int from_backend_untrusted(void *frontend_handle, const char *data, int len)
+{
+    /*
+     * No "untrusted" output should get here (the way the code is
+     * currently, it's all diverted by FLAG_STDERR).
+     */
+    assert(!"Unexpected call to from_backend_untrusted()");
+    return 0; /* not reached */
+}
+
+int get_userpass_input(prompts_t *p, unsigned char *in, int inlen)
+{
+    int ret;
+    ret = cmdline_get_passwd_input(p, in, inlen);
+    if (ret == -1)
+	ret = console_get_userpass_input(p, in, inlen);
+    return ret;
+}
+
 /*
  * Handle data from a local tty in PARMRK format.
  */
@@ -505,6 +527,8 @@ static void usage(void)
     printf("  -4 -6     force use of IPv4 or IPv6\n");
     printf("  -C        enable compression\n");
     printf("  -i key    private key file for authentication\n");
+    printf("  -noagent  disable use of Pageant\n");
+    printf("  -agent    enable use of Pageant\n");
     printf("  -m file   read remote command(s) from file\n");
     printf("  -s        remote command is an SSH subsystem (SSH-2 only)\n");
     printf("  -N        don't start a shell/command (SSH-2 only)\n");
@@ -531,8 +555,6 @@ int main(int argc, char **argv)
     void *ldisc, *logctx;
     long now;
 
-    ssh_get_line = console_get_line;
-
     fdlist = NULL;
     fdcount = fdsize = 0;
     /*
@@ -608,8 +630,6 @@ int main(int argc, char **argv)
 	    if (!*cfg.host) {
 		char *q = p;
 
-                do_defaults(NULL, &cfg);
-
 		/*
 		 * If the hostname starts with "telnet:", set the
 		 * protocol to Telnet and process the string as a