X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/41ff465810a9da24b00513e92f5aac8f1e0d5ae0..d8d6c7e50e1fcf5171ec15f8a3e9bdcd141f0b64:/plink.c

diff --git a/plink.c b/plink.c
index c60902b5..f8a9f7ce 100644
--- a/plink.c
+++ b/plink.c
@@ -162,6 +162,63 @@ void askcipher(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(char *filename)
+{
+    HANDLE hin;
+    DWORD savemode, i;
+
+    static const char msgtemplate[] =
+	"The session log file \"%.*s\" already exists.\n"
+	"You can overwrite it with a new session log,\n"
+	"append your session log to the end of it,\n"
+	"or disable session logging for this session.\n"
+	"Enter \"y\" to wipe the file, \"n\" to append to it,\n"
+	"or just press Return to disable logging.\n"
+	"Wipe the log file? (y/n, Return cancels logging) ";
+
+    char line[32];
+
+    fprintf(stderr, msgtemplate, FILENAME_MAX, filename);
+    fflush(stderr);
+
+    hin = GetStdHandle(STD_INPUT_HANDLE);
+    GetConsoleMode(hin, &savemode);
+    SetConsoleMode(hin, (savemode | ENABLE_ECHO_INPUT |
+			 ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT));
+    ReadFile(hin, line, sizeof(line) - 1, &i, NULL);
+    SetConsoleMode(hin, savemode);
+
+    if (line[0] == 'y' || line[0] == 'Y')
+	return 2;
+    else if (line[0] == 'n' || line[0] == 'N')
+	return 1;
+    else
+	return 0;
+}
+
+/*
+ * Warn about the obsolescent key file format.
+ */
+void old_keyfile_warning(void)
+{
+    static const char message[] =
+	"You are loading an SSH 2 private key which has an\n"
+	"old version of the file format. This means your key\n"
+	"file is not fully tamperproof. Future versions of\n"
+	"PuTTY may stop supporting this private key format,\n"
+	"so we recommend you convert your key to the new\n"
+	"format.\n"
+	"\n"
+	"Once the key is loaded into PuTTYgen, you can perform\n"
+	"this conversion simply by saving it again.\n";
+
+    fputs(message, stderr);
+}
+
 HANDLE inhandle, outhandle, errhandle;
 DWORD orig_console_mode;
 
@@ -387,6 +444,7 @@ int main(int argc, char **argv)
     SOCKET *sklist;
     int skcount, sksize;
     int connopen;
+    int exitcode;
     char extra_portfwd[sizeof(cfg.portfwd)];
 
     ssh_get_line = get_line;
@@ -433,6 +491,9 @@ int main(int argc, char **argv)
 	    } else if (!strcmp(p, "-telnet")) {
 		default_protocol = cfg.protocol = PROT_TELNET;
 		default_port = cfg.port = 23;
+	    } else if (!strcmp(p, "-rlogin")) {
+		default_protocol = cfg.protocol = PROT_RLOGIN;
+		default_port = cfg.port = 513;
 	    } else if (!strcmp(p, "-raw")) {
 		default_protocol = cfg.protocol = PROT_RAW;
 	    } else if (!strcmp(p, "-v")) {
@@ -716,8 +777,11 @@ int main(int argc, char **argv)
     {
 	char *error;
 	char *realhost;
+	/* nodelay is only useful if stdin is a character device (console) */
+	int nodelay = cfg.tcp_nodelay &&
+	    (GetFileType(GetStdHandle(STD_INPUT_HANDLE)) == FILE_TYPE_CHAR);
 
-	error = back->init(cfg.host, cfg.port, &realhost);
+	error = back->init(cfg.host, cfg.port, &realhost, nodelay);
 	if (error) {
 	    fprintf(stderr, "Unable to open connection:\n%s", error);
 	    return 1;
@@ -904,5 +968,10 @@ int main(int argc, char **argv)
 	    break;		       /* we closed the connection */
     }
     WSACleanup();
-    return 0;
+    exitcode = back->exitcode();
+    if (exitcode < 0) {
+	fprintf(stderr, "Remote process exit code unavailable\n");
+	exitcode = 1;		       /* this is an error condition */
+    }
+    return exitcode;
 }