--- gvpe/src/vpectrl.C	2003/10/16 21:57:54	1.6
+++ gvpe/src/vpectrl.C	2005/03/03 16:54:34	1.13
@@ -1,10 +1,12 @@
 /*
-    vpectrl.C -- the main file for vpectrl
+    vpectrl.C -- the main file for gvpectrl
     Copyright (C) 1998-2002 Ivo Timmermans <ivo@o2w.nl>
                   2000-2002 Guus Sliepen <guus@sliepen.eu.org>
-                  2003      Marc Lehmann <pcg@goof.com>
+                  2003-2005 Marc Lehmann <gvpe@schmorp.de>
  
-    This program is free software; you can redistribute it and/or modify
+    This file is part of GVPE.
+
+    GVPE is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
@@ -15,7 +17,7 @@
     GNU General Public License for more details.
  
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
+    along with gvpe; if not, write to the Free Software
     Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
@@ -23,6 +25,8 @@
 
 #include <cstdio>
 #include <cstring>
+#include <cstdlib>
+#include <locale.h>
 
 #include <errno.h>
 #include <fcntl.h>
@@ -126,8 +130,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"))
@@ -238,7 +240,7 @@
       if (!f)
         {
           perror (fname);
-          exit (1);
+          exit (EXIT_FAILURE);
         }
 
       if (ftell (f))
@@ -262,7 +264,7 @@
       else
         fprintf (stderr, _("Done.\n"));
 
-      PEM_write_RSAPublicKey (f, rsa_key);
+      require (PEM_write_RSAPublicKey (f, rsa_key));
       fclose (f);
       free (fname);
 
@@ -272,10 +274,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);
     }
@@ -313,7 +315,6 @@
   if (show_help)
     usage (0);
 
-  make_names ();
   conf.read_config (false);
 
   if (generate_keys)
@@ -328,7 +329,7 @@
   if (show_config)
     {
       conf.print ();
-      exit (0);
+      exit (EXIT_SUCCESS);
     }
 
   usage (1);