Yet more global-removal. The static variables in logging.c are now

[PuTTY.git] / puttygen.c

diff --git a/puttygen.c b/puttygen.c
index 072b7d05c3e303f4ec79b2c47dccd193b23393fa..956cdaf42cba8f6424068282dd9e7803a14385c6 100644 (file)
--- a/puttygen.c
+++ b/puttygen.c
@@ -22,6 +22,22 @@ static int requested_help;
 
 static char *cmdline_keyfile = NULL;
 
+/*
+ * Print a modal (Really Bad) message box and perform a fatal exit.
+ */
+void modalfatalbox(char *fmt, ...)
+{
+    va_list ap;
+    char stuff[200];
+
+    va_start(ap, fmt);
+    vsprintf(stuff, fmt, ap);
+    va_end(ap);
+    MessageBox(NULL, stuff, "PuTTYgen Fatal Error",
+              MB_SYSTEMMODAL | MB_ICONERROR | MB_OK);
+    exit(1);
+}
+
 /* ----------------------------------------------------------------------
  * Progress report code. This is really horrible :-)
  */
@@ -205,14 +221,6 @@ static int prompt_keyfile(HWND hwnd, char *dlgtitle,
        return GetOpenFileName(&of);
 }
 
-/*
- * This function is needed to link with the DES code. We need not
- * have it do anything at all.
- */
-void logevent(char *msg)
-{
-}
-
 /*
  * Dialog-box function for the Licence box.
  */
@@ -1384,7 +1392,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
     int argc;
     char **argv;
 
-    split_into_argv(cmdline, &argc, &argv);
+    split_into_argv(cmdline, &argc, &argv, NULL);
 
     if (argc > 0) {
        /*