X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/973612f5e86c9eaabc812a47d81c5cb14f672249..6226c9390d23d6868edde63b9568891cd88631cc:/unix/uxplink.c

diff --git a/unix/uxplink.c b/unix/uxplink.c
index 0e27366e..1daafe4b 100644
--- a/unix/uxplink.c
+++ b/unix/uxplink.c
@@ -527,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");
@@ -897,7 +899,7 @@ int main(int argc, char **argv)
 	FD_SET_MAX(signalpipe[0], maxfd, rset);
 
 	if (connopen && !sending &&
-	    back->socket(backhandle) != NULL &&
+	    back->connected(backhandle) &&
 	    back->sendok(backhandle) &&
 	    back->sendbuffer(backhandle) < MAX_STDIN_BACKLOG) {
 	    /* If we're OK to send, then try to read from stdin. */
@@ -1012,7 +1014,7 @@ int main(int argc, char **argv)
 	    char buf[4096];
 	    int ret;
 
-	    if (connopen && back->socket(backhandle) != NULL) {
+	    if (connopen && back->connected(backhandle)) {
 		ret = read(0, buf, sizeof(buf));
 		if (ret < 0) {
 		    perror("stdin: read");
@@ -1037,7 +1039,7 @@ int main(int argc, char **argv)
 	    try_output(1);
 	}
 
-	if ((!connopen || back->socket(backhandle) == NULL) &&
+	if ((!connopen || !back->connected(backhandle)) &&
 	    bufchain_size(&stdout_data) == 0 &&
 	    bufchain_size(&stderr_data) == 0)
 	    break;		       /* we closed the connection */