X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fcheck_overcr.c;h=16ada20d9667cff550ca9a7756a63d8e70d2d8e8;hb=b48c2bdd59783197c93cde531e6e8b9747c0a88f;hp=25a7785a8949f39043a02fc026c45e2bec7772f5;hpb=fd329a1e91cccc8845923af572890ac42b76afc1;p=nagiosplug.git

diff --git a/plugins/check_overcr.c b/plugins/check_overcr.c
index 25a7785..16ada20 100644
--- a/plugins/check_overcr.c
+++ b/plugins/check_overcr.c
@@ -1,43 +1,36 @@
-/******************************************************************************
-*
+/*****************************************************************************
+* 
 * Nagios check_overcr plugin
-*
+* 
 * License: GPL
-* Copyright (c) 2000-2006 nagios-plugins team
-*
-* Last Modified: $Date$
-*
+* Copyright (c) 2000-2007 Nagios Plugins Development Team
+* 
 * Description:
-*
+* 
 * This file contains the check_overcr plugin
-*
-*  This plugin attempts to contact the Over-CR collector daemon running on the
-*  remote UNIX server in order to gather the requested system information.
-*
-*
-* License Information:
-*
-* This program is free software; you can redistribute it and/or modify
+* 
+* This plugin attempts to contact the Over-CR collector daemon running on the
+* remote UNIX server in order to gather the requested system information.
+* 
+* 
+* 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
-* the Free Software Foundation; either version 2 of the License, or
+* the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
-*
+* 
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * 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
-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
- $Id$
- 
-******************************************************************************/
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+* 
+* 
+*****************************************************************************/
 
 const char *progname = "check_overcr";
-const char *revision = "$Revision$";
-const char *copyright = "2000-2006";
+const char *copyright = "2000-2007";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
 #include "common.h"
@@ -102,6 +95,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)
 		usage4 (_("Could not parse arguments"));
 
@@ -346,7 +342,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 'H':									/* hostname */
 			server_address = optarg;
@@ -415,7 +411,7 @@ print_help (void)
 	char *myport;
 	asprintf (&myport, "%d", PORT);
 
-	print_revision (progname, revision);
+	print_revision (progname, NP_VERSION);
 
 	printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
 	printf (COPYRIGHT, copyright, email);
@@ -427,9 +423,10 @@ print_help (void)
 
 	print_usage ();
 
-	printf (_(UT_HELP_VRSN));
+	printf (UT_HELP_VRSN);
+	printf (UT_EXTRA_OPTS);
 
-	printf (_(UT_HOST_PORT), 'p', myport);
+	printf (UT_HOST_PORT, 'p', myport);
 
   printf (" %s\n", "-w, --warning=INTEGER");
   printf ("    %s\n", _("Threshold which will result in a warning status"));
@@ -445,27 +442,28 @@ print_help (void)
   printf ("    %s\n", _("NET<port>     = number of active connections on TCP port <port>"));
   printf ("    %s\n", _("UPTIME        = system uptime in seconds"));
 
-	printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
+	printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+
+  printf (UT_VERBOSE);
 
-  printf (_(UT_VERBOSE));
   printf ("\n");
-  printf ("%s\n", _("Notes:"));
-  
-	printf ("%s\n", _("For the available options, the critical threshold value should always be"));
-  printf ("%s\n\n", _("higher than the warning threshold value, EXCEPT with the uptime variable"));
+  printf ("%s\n", _("This plugin requires that Eric Molitors' Over-CR collector daemon be"));
+  printf ("%s\n", _("running on the remote server."));
+  printf ("%s\n", _("Over-CR can be downloaded from http://www.molitor.org/overcr"));
+  printf ("%s\n", _("This plugin was tested with version 0.99.53 of the Over-CR collector"));
 
-	printf ("%s\n", _("This plugin requres that Eric Molitors' Over-CR collector daemon be"));
-  printf ("%s\n", _("running on the remote server. Over-CR can be downloaded from"));
-  printf ("%s\n", _("http://www.molitor.org/overcr (This plugin was tested with version 0.99.53"));
-  printf ("%s\n", _("of the Over-CR collector)"));
+  printf ("\n");
+  printf ("%s\n", _("Notes:"));
+  printf (" %s\n", _("For the available options, the critical threshold value should always be"));
+  printf (" %s\n", _("higher than the warning threshold value, EXCEPT with the uptime variable"));
 
-	printf (_(UT_SUPPORT));
+  printf (UT_SUPPORT);
 }
 
 
 void
 print_usage (void)
 {
-  printf (_("Usage:"));
+  printf ("%s\n", _("Usage:"));
 	printf ("%s -H host [-p port] [-v variable] [-w warning] [-c critical] [-t timeout]\n", progname);
 }