X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fnegate.c;h=d08c3a309e30b868cd6dc7a51c0655d48797c5ee;hb=edf94c7d2a21142b0cf9613dbbc1ff7a48f456ef;hp=a71f1b67147516fbfd97a4c06484ce578c8a7d7c;hpb=0c1c9f51e2c33db04918d2aa322fd1f9a688979b;p=nagiosplug.git

diff --git a/plugins/negate.c b/plugins/negate.c
index a71f1b6..d08c3a3 100644
--- a/plugins/negate.c
+++ b/plugins/negate.c
@@ -13,6 +13,8 @@
  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$
 
 @@-<article>
 
@@ -53,7 +55,7 @@
 
 const char *progname = "negate";
 const char *revision = "$Revision$";
-const char *copyright = "2002-2003";
+const char *copyright = "2002-2004";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
 #define DEFAULT_TIMEOUT 9
@@ -69,6 +71,8 @@ int validate_arguments (void);
 void print_help (void);
 void print_usage (void);
 
+
+
 int
 main (int argc, char **argv)
 {
@@ -80,7 +84,7 @@ main (int argc, char **argv)
 	textdomain (PACKAGE);
 
 	if (process_arguments (argc, argv) == ERROR)
-		usage (_("Could not parse arguments\n"));
+		usage4 (_("Could not parse arguments"));
 
 	/* Set signal handling and alarm */
 	if (signal (SIGALRM, timeout_alarm_handler) == SIG_ERR)
@@ -93,6 +97,7 @@ main (int argc, char **argv)
 		die (STATE_UNKNOWN, _("Could not open pipe: %s\n"), command_line);
 
 	child_stderr = fdopen (child_stderr_array[fileno (child_process)], "r");
+	
 	if (child_stderr == NULL) {
 		printf (_("Could not open stderr for %s\n"), command_line);
 	}
@@ -125,8 +130,6 @@ main (int argc, char **argv)
 	else
 		exit (result);
 }
-
-
 
 /******************************************************************************
 @@-
@@ -146,6 +149,8 @@ is a only a 'timeout' option.</para>
 -@@
 ******************************************************************************/
 
+
+
 /* process command-line arguments */
 int
 process_arguments (int argc, char **argv)
@@ -169,7 +174,7 @@ process_arguments (int argc, char **argv)
 
 		switch (c) {
 		case '?':     /* help */
-			usage3 (_("Unknown argument"), optopt);
+			usage2 (_("Unknown argument"), optarg);
 			break;
 		case 'h':     /* help */
 			print_help ();
@@ -207,6 +212,8 @@ process_arguments (int argc, char **argv)
 -@@
 ******************************************************************************/
 
+
+
 int
 validate_arguments ()
 {
@@ -225,19 +232,15 @@ validate_arguments ()
 
 
 
-
-
-
 void
 print_help (void)
 {
 	print_revision (progname, revision);
 
-	printf (_(COPYRIGHT), copyright, email);
+	printf (COPYRIGHT, copyright, email);
 
 	printf (_("\
-Negates the status of a plugin (returns OK for CRITICAL, and vice-versa).\n\
-\n"));
+Negates the status of a plugin (returns OK for CRITICAL, and vice-versa).\n\n"));
 
 	print_usage ();
 
@@ -265,12 +268,8 @@ Otherwise, the output state of the wrapped plugin is unchanged.\n"));
 
 
 
-
-
 void
 print_usage (void)
 {
-	printf (_("Usage: %s [-t timeout] <definition of wrapped plugin>\n"),
-	        progname);
-	printf (_(UT_HLP_VRS), progname, progname);
+	printf ("Usage: %s [-t timeout] <definition of wrapped plugin>\n",progname);
 }