scanf parsing fix for check_swap from tracker id 1123292. now use floor(3)

[nagiosplug.git] / plugins / check_mrtg.c

diff --git a/plugins/check_mrtg.c b/plugins/check_mrtg.c
index 31d132d443758ac3335542b3271279fb4f58a93a..067429cf26eddc83518d22b2d60ddbff0d11cfbd 100644 (file)
--- a/plugins/check_mrtg.c
+++ b/plugins/check_mrtg.c
@@ -20,7 +20,7 @@
 
 const char *progname = "check_mrtg";
 const char *revision =  "$Revision$";
-const char *copyright = "1999-2001";
+const char *copyright = "1999-2004";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
 #include "common.h"
@@ -43,7 +43,7 @@ char *units;
 int
 main (int argc, char **argv)
 {
-       int result = STATE_OK;
+       int result = STATE_UNKNOWN;
        FILE *fp;
        int line;
        char input_buffer[MAX_INPUT_BUFFER];
@@ -59,7 +59,7 @@ main (int argc, char **argv)
        bindtextdomain (PACKAGE, LOCALEDIR);
        textdomain (PACKAGE);
 
-       if (process_arguments (argc, argv) != TRUE)
+       if (process_arguments (argc, argv) == ERROR)
                usage4 (_("Could not parse arguments\n"));
 
        /* open the MRTG log file for reading */
@@ -152,7 +152,9 @@ main (int argc, char **argv)
 
        return result;
 }
-\f
+
+
+
 /* process command-line arguments */
 int
 process_arguments (int argc, char **argv)
@@ -210,7 +212,7 @@ process_arguments (int argc, char **argv)
                case 'v':
                        variable_number = atoi (optarg);
                        if (variable_number < 1 || variable_number > 2)
-                               usage (_("Invalid variable number\n"));
+                               usage4 (_("Invalid variable number"));
                        break;
                case 'w':                                                                       /* critical time threshold */
                        value_warning_threshold = strtoul (optarg, NULL, 10);
@@ -231,9 +233,7 @@ process_arguments (int argc, char **argv)
                        print_help ();
                        exit (STATE_OK);
                case '?':                                                                       /* help */
-                       printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
-                       print_usage ();
-                       exit (STATE_UNKNOWN);
+                       usage2 (_("Unknown argument"), optarg);
                }
        }
 
@@ -291,7 +291,7 @@ int
 validate_arguments (void)
 {
        if (variable_number == -1)
-               usage (_("You must supply the variable number\n"));
+               usage4 (_("You must supply the variable number"));
 
        if (label == NULL)
                label = strdup ("value");
@@ -304,9 +304,6 @@ validate_arguments (void)
 
 
 
-
-
-\f
 void
 print_help (void)
 {
@@ -317,7 +314,7 @@ print_help (void)
 
        printf(_("\
 This plugin will check either the average or maximum value of one of the\n\
-two variables recorded in an MRTG log file.\n"));
+two variables recorded in an MRTG log file.\n\n"));
 
        print_usage ();
 
@@ -370,15 +367,14 @@ this plugin works well for monitoring that kind of data as well.\n\n"));
 
 
 
-
 /* original command line: 
         <log_file> <expire_minutes> <AVG|MAX> <variable> <vwl> <vcl> <label> [units] */
 
 void
 print_usage (void)
 {
-       printf (_("\
+       printf ("\
 Usage: %s -F log_file -a <AVG | MAX> -v variable -w warning -c critical\n\
-  [-l label] [-u units] [-e expire_minutes] [-t timeout] [-v]\n"), progname);
-       printf (_(UT_HLP_VRS), progname, progname);
+                  [-l label] [-u units] [-e expire_minutes] [-t timeout]\n\
+                  [-v]\n", progname);
 }