--- gvpe/src/vpectrl.C	2003/04/02 03:25:17	1.2
+++ gvpe/src/vpectrl.C	2004/05/10 20:13:10	1.10
@@ -2,7 +2,7 @@
     vpectrl.C -- the main file for vpectrl
     Copyright (C) 1998-2002 Ivo Timmermans <ivo@o2w.nl>
                   2000-2002 Guus Sliepen <guus@sliepen.eu.org>
-                  2003      Marc Lehmannn <pcg@goof.com>
+                  2003      Marc Lehmann <pcg@goof.com>
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -23,11 +23,14 @@
 
 #include <cstdio>
 #include <cstring>
+#include <cstdlib>
+#include <clocale>
 
 #include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
 #include <signal.h>
+#include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <signal.h>
@@ -125,8 +128,6 @@
                 kill_vped = SIGUSR1;
               else if (!strcasecmp (optarg, "USR2"))
                 kill_vped = SIGUSR2;
-              else if (!strcasecmp (optarg, "WINCH"))
-                kill_vped = SIGWINCH;
               else if (!strcasecmp (optarg, "INT"))
                 kill_vped = SIGINT;
               else if (!strcasecmp (optarg, "ALRM"))
@@ -237,7 +238,7 @@
       if (!f)
         {
           perror (fname);
-          exit (1);
+          exit (EXIT_FAILURE);
         }
 
       if (ftell (f))
@@ -261,7 +262,7 @@
       else
         fprintf (stderr, _("Done.\n"));
 
-      PEM_write_RSAPublicKey (f, rsa_key);
+      require (PEM_write_RSAPublicKey (f, rsa_key));
       fclose (f);
       free (fname);
 
@@ -271,10 +272,10 @@
       if (!f)
         {
           perror (fname);
-          exit (1);
+          exit (EXIT_FAILURE);
         }
 
-      PEM_write_RSAPrivateKey (f, rsa_key, NULL, NULL, 0, NULL, NULL);
+      require (PEM_write_RSAPrivateKey (f, rsa_key, NULL, NULL, 0, NULL, NULL));
       fclose (f);
       free (fname);
     }
@@ -296,8 +297,9 @@
 
   if (show_version)
     {
-      printf (_("%s version %s (built %s %s, protocol %d:%d)\n"), get_identity (),
+      printf (_("%s version %s (built %s %s, protocol %d.%d)\n"), get_identity (),
               VERSION, __DATE__, __TIME__, PROTOCOL_MAJOR, PROTOCOL_MINOR);
+      printf (_("Built with kernel interface %s/%s.\n"), IFTYPE, IFSUBTYPE);
       printf (_
               ("Copyright (C) 2003 Marc Lehmann <vpe@plan9.de> and others.\n"
                "See the AUTHORS file for a complete list.\n\n"
@@ -311,7 +313,6 @@
   if (show_help)
     usage (0);
 
-  make_names ();
   conf.read_config (false);
 
   if (generate_keys)
@@ -326,7 +327,7 @@
   if (show_config)
     {
       conf.print ();
-      exit (0);
+      exit (EXIT_SUCCESS);
     }
 
   usage (1);