1041571: -D option processing corrected (Eric Chen). Changed process_arguments()...

[nagiosplug.git] / plugins / negate.c

diff --git a/plugins/negate.c b/plugins/negate.c
index 3dd3411fceb5d0ffc7e80771ce0fccee00f7b675..74a9a9ddb88b806261e7248873526617c48a02ff 100644 (file)
--- 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)
 {
@@ -79,8 +83,8 @@ main (int argc, char **argv)
        bindtextdomain (PACKAGE, LOCALEDIR);
        textdomain (PACKAGE);
 
-       if (process_arguments (argc, argv) == ERROR)
-               usage (_("Could not parse arguments\n"));
+       if (process_arguments (argc, argv) != TRUE)
+               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);
 }
-\f
-
 
 /******************************************************************************
 @@-
@@ -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,9 @@ process_arguments (int argc, char **argv)
 
                switch (c) {
                case '?':     /* help */
-                       usage3 (_("Unknown argument"), optopt);
+                       printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
+                       print_usage ();
+                       exit (STATE_UNKNOWN);
                        break;
                case 'h':     /* help */
                        print_help ();
@@ -180,7 +187,7 @@ process_arguments (int argc, char **argv)
                        exit (EXIT_SUCCESS);
                case 't':     /* timeout period */
                        if (!is_integer (optarg))
-                               usage2 (_("Timeout Interval must be an integer"), optarg);
+                               usage2 (_("Timeout interval must be a positive integer"), optarg);
                        else
                                timeout_interval = atoi (optarg);
                        break;
@@ -207,6 +214,8 @@ process_arguments (int argc, char **argv)
 -@@
 ******************************************************************************/
 
+
+
 int
 validate_arguments ()
 {
@@ -225,19 +234,15 @@ validate_arguments ()
 
 
 
-
-
-\f
 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 +270,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);
 }