Add another error string match from Pasi Tiittanen

[nagiosplug.git] / plugins / check_hpjd.c

diff --git a/plugins/check_hpjd.c b/plugins/check_hpjd.c
index 8d3f4c80fd9afd278c8dbde68f6e40c3a55d7ee8..53769565b87827c84778f0472ec2ac1a94fdd2e3 100644 (file)
--- a/plugins/check_hpjd.c
+++ b/plugins/check_hpjd.c
@@ -14,8 +14,14 @@
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 *
+* $Id$
 *****************************************************************************/
 
+const char *progname = "check_hpjd";
+const char *revision = "$Revision$";
+const char *copyright = "2000-2004";
+const char *email = "nagiosplug-devel@lists.sourceforge.net";
+
 #include "common.h"
 #include "popen.h"
 #include "utils.h"
@@ -23,10 +29,6 @@
 
 #define DEFAULT_COMMUNITY "public"
 
-const char *progname = "check_hpjd";
-const char *revision = "$Revision$";
-const char *copyright = "2000-2003";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
 const char *option_summary = "-H host [-C community]\n";
 
@@ -58,7 +60,7 @@ int
 main (int argc, char **argv)
 {
        char command_line[1024];
-       int result;
+       int result = STATE_UNKNOWN;
        int line;
        char input_buffer[MAX_INPUT_BUFFER];
        char query_string[512];
@@ -83,8 +85,8 @@ main (int argc, char **argv)
        bindtextdomain (PACKAGE, LOCALEDIR);
        textdomain (PACKAGE);
 
-       if (process_arguments (argc, argv) != OK)
-               usage (_("Invalid command arguments supplied\n"));
+       if (process_arguments (argc, argv) == ERROR)
+               usage4 (_("Could not parse arguments"));
 
        /* removed ' 2>1' at end of command 10/27/1999 - EG */
        /* create the query string */
@@ -103,7 +105,7 @@ main (int argc, char **argv)
                 HPJD_GD_DOOR_OPEN, HPJD_GD_PAPER_OUTPUT, HPJD_GD_STATUS_DISPLAY);
 
        /* get the command to run */
-       sprintf (command_line, "%s -m : -v 1 -c %s %s %s", PATH_TO_SNMPGET, community, 
+       sprintf (command_line, "%s -OQa -m : -v 1 -c %s %s %s", PATH_TO_SNMPGET, community, 
                                                                        address, query_string);
 
        /* run the command */
@@ -285,8 +287,6 @@ main (int argc, char **argv)
 
 
 
-
-
 /* process command-line arguments */
 int
 process_arguments (int argc, char **argv)
@@ -321,7 +321,7 @@ process_arguments (int argc, char **argv)
                                address = strscpy(address, optarg) ;
                        }
                        else {
-                               usage (_("Invalid host name\n"));
+                               usage2 (_("Invalid hostname/address"), optarg);
                        }
                        break;
                case 'C':                                                                       /* community */
@@ -334,7 +334,9 @@ process_arguments (int argc, char **argv)
                        print_help ();
                        exit (STATE_OK);
                case '?':                                                                       /* help */
-                       usage (_("Invalid argument\n"));
+                       printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
+                       print_usage ();
+                       exit (STATE_UNKNOWN);
                }
        }
 
@@ -344,7 +346,7 @@ process_arguments (int argc, char **argv)
                        address = argv[c++];
                }
                else {
-                       usage (_("Invalid host name"));
+                       usage2 (_("Invalid hostname/address"), argv[c]);
                }
        }
        
@@ -360,8 +362,6 @@ process_arguments (int argc, char **argv)
 
 
 
-
-
 int
 validate_arguments (void)
 {
@@ -370,16 +370,13 @@ validate_arguments (void)
 
 
 
-
-
-\f
 void
 print_help (void)
 {
        print_revision (progname, revision);
 
-       printf (_("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n"));
-       printf (_(COPYRIGHT), copyright, email);
+       printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
+       printf (COPYRIGHT, copyright, email);
 
        printf (_("\
 This plugin tests the STATUS of an HP printer with a JetDirect card.\n\
@@ -398,11 +395,8 @@ Net-snmp must be installed on the computer running the plugin.\n\n"));
 
 
 
-
 void
 print_usage (void)
 {
-       printf (_("\
-Usage: %s -H host [-C community]\n"), progname);
-       printf (_(UT_HLP_VRS), progname, progname);
+       printf ("Usage: %s -H host [-C community]\n", progname);
 }