X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fcheck_nagios.c;h=6485aa9a351fa5d4ba170bf7b385d85c11b19a2a;hb=5ebe25fc24d33cf2d7b46fce9e746a58e0115010;hp=b3088a1deeee7ad63d708c855c3526fe2bf357bc;hpb=fa4efcdf6df1096ff1f6740c7f44b213b47dc9d3;p=nagiosplug.git

diff --git a/plugins/check_nagios.c b/plugins/check_nagios.c
index b3088a1..6485aa9 100644
--- a/plugins/check_nagios.c
+++ b/plugins/check_nagios.c
@@ -5,8 +5,6 @@
 * License: GPL
 * Copyright (c) 1999-2007 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_nagios plugin
@@ -31,12 +29,10 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * 
-* $Id$
 * 
 *****************************************************************************/
 
 const char *progname = "check_nagios";
-const char *revision = "$Revision$";
 const char *copyright = "1999-2007";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
@@ -88,6 +84,9 @@ main (int argc, char **argv)
 	bindtextdomain (PACKAGE, LOCALEDIR);
 	textdomain (PACKAGE);
 
+	/* Parse extra opts if any */
+	argv=np_extra_opts (&argc, argv, progname);
+
 	if (process_arguments (argc, argv) == ERROR)
 		usage_va(_("Could not parse arguments"));
 
@@ -184,8 +183,8 @@ main (int argc, char **argv)
 	printf (ngettext ("%d process", "%d processes", proc_entries), proc_entries);
 	printf (", ");
 	printf (
-	  ngettext ("status log updated %d second ago", 
-	    "status log updated %d seconds ago", 
+	  ngettext ("status log updated %d second ago",
+	    "status log updated %d seconds ago",
 	    (int) (current_time - latest_entry_time) ),
 	    (int) (current_time - latest_entry_time) );
 	printf ("\n");
@@ -237,7 +236,7 @@ process_arguments (int argc, char **argv)
 			print_help ();
 			exit (STATE_OK);
 		case 'V':									/* version */
-			print_revision (progname, revision);
+			print_revision (progname, NP_VERSION);
 			exit (STATE_OK);
 		case 'F':									/* status log */
 			status_log = optarg;
@@ -275,7 +274,7 @@ process_arguments (int argc, char **argv)
 void
 print_help (void)
 {
-	print_revision (progname, revision);
+	print_revision (progname, NP_VERSION);
 
 	printf (_(COPYRIGHT), copyright, email);
 
@@ -285,10 +284,11 @@ print_help (void)
   printf ("%s\n", _("It also checks the process table for a process matching the command argument."));
 
   printf ("\n\n");
-  
+
 	print_usage ();
 
-	printf (_(UT_HELP_VRSN));
+	printf (UT_HELP_VRSN);
+	printf (UT_EXTRA_OPTS);
 
 	printf (" %s\n", "-F, --filename=FILE");
   printf ("    %s\n", _("Name of the log file to check"));
@@ -296,11 +296,13 @@ print_help (void)
   printf ("    %s\n", _("Minutes aging after which logfile is considered stale"));
   printf (" %s\n", "-C, --command=STRING");
   printf ("    %s\n", _("Substring to search for in process arguments"));
-  printf (_(UT_VERBOSE));
+  printf (UT_VERBOSE);
+
   printf ("\n");
   printf ("%s\n", _("Examples:"));
   printf (" %s\n", "check_nagios -e 5 -F /usr/local/nagios/var/status.log -C /usr/local/nagios/bin/nagios");
-  printf (_(UT_SUPPORT));
+
+  printf (UT_SUPPORT);
 }
 
 
@@ -308,6 +310,6 @@ print_help (void)
 void
 print_usage (void)
 {
-  printf (_("Usage:"));
+  printf ("%s\n", _("Usage:"));
 	printf ("%s -F <status log file> -e <expire_minutes> -C <process_string>\n", progname);
 }