--- gvpe/src/vped.C	2003/10/16 14:12:00	1.12
+++ gvpe/src/vped.C	2005/03/03 16:54:34	1.22
@@ -1,10 +1,12 @@
 /*
-    vped.C -- the main file for vped
+    vped.C -- the main file for gvpe
     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>
@@ -149,8 +153,8 @@
 {
   network.shutdown_all ();
 
-  if (pidfilename)
-    remove_pid (pidfilename);
+  if (conf.pidfilename)
+    remove_pid (conf.pidfilename);
 
   slog (L_INFO, _("terminating with exit code %d"), c);
 
@@ -222,6 +226,7 @@
     {
       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"
@@ -245,7 +250,6 @@
       slog (L_ERR, _("system call `%s' failed: %s"), "mlockall", strerror (errno));
 #endif
 
-  make_names ();
   conf.read_config (true);
 
   set_loglevel (llevel != L_NONE ? llevel : conf.llevel);
@@ -254,23 +258,23 @@
 
   if (!THISNODE)
     {
-      slog (L_ERR, _("current node not set, or node '%s' not found in configfile, use the -n switch when starting vped."),
+      slog (L_ERR, _("current node not set, or node '%s' not found in configfile, specify the nodename when starting vped."),
             thisnode ? thisnode : "<unset>");
-      exit (1);
+      exit (EXIT_FAILURE);
     }
 
   if (detach (do_detach))
-    exit (0);
+    exit (EXIT_SUCCESS);
 
   setup_signals ();
 
   if (!network.setup ())
     {
-      iom.loop ();
-      cleanup_and_exit (1);
+      io_manager::loop ();
+      cleanup_and_exit (EXIT_FAILURE);
     }
 
   slog (L_ERR, _("unable to setup network, unrecoverable error, exiting."));
-  cleanup_and_exit (1);
+  cleanup_and_exit (EXIT_FAILURE);
 }