check_http min size option (680467 - Dave Viner)

[nagiosplug.git] / plugins / check_hpjd.c

diff --git a/plugins/check_hpjd.c b/plugins/check_hpjd.c
index 42b4bb544d3e75b05637cc044159af57721c61e2..267de2e04f6edce4d14529574fd27ef0c194b485 100644 (file)
--- a/plugins/check_hpjd.c
+++ b/plugins/check_hpjd.c
@@ -65,7 +65,7 @@
 #include "popen.h"
 #include "utils.h"
 
-#define PROGNAME "check_hpjd"
+const char *progname = "check_hpjd";
 #define REVISION "$Revision$"
 #define COPYRIGHT "2000-2002"
 
@@ -85,13 +85,15 @@
 #define ONLINE         0
 #define OFFLINE                1
 
+#define DEFAULT_COMMUNITY "public"
+
 int process_arguments (int, char **);
 int validate_arguments (void);
 void print_help (void);
 void print_usage (void);
 
-char *community = NULL;
-char *address = "127.0.0.1";
+char *community = DEFAULT_COMMUNITY;
+char *address = NULL;
 
 
 int
@@ -392,11 +394,10 @@ process_arguments (int argc, char **argv)
        int option_index = 0;
        static struct option long_options[] = {
                {"hostname", required_argument, 0, 'H'},
-               {"expect", required_argument, 0, 'e'},
+               {"community", required_argument, 0, 'C'},
 /*             {"critical",       required_argument,0,'c'}, */
 /*             {"warning",        required_argument,0,'w'}, */
 /*             {"port",           required_argument,0,'P'}, */
-               {"verbose", no_argument, 0, 'v'},
                {"version", no_argument, 0, 'V'},
                {"help", no_argument, 0, 'h'},
                {0, 0, 0, 0}
@@ -406,15 +407,7 @@ process_arguments (int argc, char **argv)
        if (argc < 2)
                return ERROR;
 
-       for (c = 1; c < argc; c++) {
-               if (strcmp ("-to", argv[c]) == 0)
-                       strcpy (argv[c], "-t");
-               else if (strcmp ("-wt", argv[c]) == 0)
-                       strcpy (argv[c], "-w");
-               else if (strcmp ("-ct", argv[c]) == 0)
-                       strcpy (argv[c], "-c");
-       }
-
+       
        while (1) {
 #ifdef HAVE_GETOPT_H
                c = getopt_long (argc, argv, "+hVH:C:", long_options, &option_index);
@@ -428,17 +421,17 @@ process_arguments (int argc, char **argv)
                switch (c) {
                case 'H':                                                                       /* hostname */
                        if (is_host (optarg)) {
-                               address = optarg;
+                               address = strscpy(address, optarg) ;
                        }
                        else {
                                usage ("Invalid host name\n");
                        }
                        break;
                case 'C':                                                                       /* community */
-                       community = optarg;
+                       community = strscpy (community, optarg);
                        break;
                case 'V':                                                                       /* version */
-                       print_revision (PROGNAME, REVISION);
+                       print_revision (progname, REVISION);
                        exit (STATE_OK);
                case 'h':                                                                       /* help */
                        print_help ();
@@ -457,9 +450,9 @@ process_arguments (int argc, char **argv)
                        usage ("Invalid host name");
                }
        }
-
-       if (community == NULL) {
-               community = argv[c++];
+       
+       if (argv[c] != NULL ) {
+               community = argv[c];
        }
 
        return validate_arguments ();
@@ -482,7 +475,7 @@ validate_arguments (void)
 void
 print_help (void)
 {
-       print_revision (PROGNAME, REVISION);
+       print_revision (progname, REVISION);
        printf
                ("Copyright (c) 2000 Ethan Galstad/Karl DeBisschop\n\n"
                 "This plugin tests the STATUS of an HP printer with a JetDirect card.\n"
@@ -493,10 +486,10 @@ print_help (void)
                 " -H, --hostname=STRING or IPADDRESS\n"
                 "   Check server on the indicated host\n"
                 " -C, --community=STRING\n"
-                "   The SNMP community name\n"
+                "   The SNMP community name (default=%s)\n"
                 " -h, --help\n"
                 "   Print detailed help screen\n"
-                " -V, --version\n" "   Print version information\n\n");
+                " -V, --version\n" "   Print version information\n\n",DEFAULT_COMMUNITY);
        support ();
 }
 
@@ -510,7 +503,7 @@ print_usage (void)
        printf
                ("Usage: %s -H host [-C community]\n"
                 "       %s --help\n"
-                "       %s --version\n", PROGNAME, PROGNAME, PROGNAME);
+                "       %s --version\n", progname, progname, progname);
 }