Fix Debian bug #574612: Return WARNING on rebuild

[nagiosplug.git] / plugins / check_hpjd.c

diff --git a/plugins/check_hpjd.c b/plugins/check_hpjd.c
index e20a76d9f2b9a6054d340096b7964d635bf18d7f..add9cc82db6fa536f8db8bd769362a328424a85d 100644 (file)
--- a/plugins/check_hpjd.c
+++ b/plugins/check_hpjd.c
@@ -5,8 +5,6 @@
 * License: GPL
 * Copyright (c) 2000-2007 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_hpjd plugin
@@ -28,12 +26,10 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * 
-* $Id$
 * 
 *****************************************************************************/
 
 const char *progname = "check_hpjd";
-const char *revision = "$Revision$";
 const char *copyright = "2000-2007";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
@@ -100,6 +96,9 @@ main (int argc, char **argv)
        bindtextdomain (PACKAGE, LOCALEDIR);
        textdomain (PACKAGE);
 
+       /* Parse extra opts if any */
+       argv=np_extra_opts (&argc, argv, progname);
+
        if (process_arguments (argc, argv) == ERROR)
                usage4 (_("Could not parse arguments"));
 
@@ -120,7 +119,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 -OQa -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 */
@@ -195,7 +194,7 @@ main (int argc, char **argv)
                                strcpy (display_message, temp_buffer + 1);
                                break;
                        default:                                                                                /* fold multiline message */
-                               strncat (display_message, input_buffer, 
+                               strncat (display_message, input_buffer,
                                                sizeof (display_message) - strlen (display_message) - 1);
                        }
 
@@ -215,7 +214,7 @@ main (int argc, char **argv)
                sprintf (errmsg, "%s", input_buffer );
 
        }
-       
+
        /* close stderr */
        (void) fclose (child_stderr);
 
@@ -229,7 +228,7 @@ main (int argc, char **argv)
                /* might not be the problem, but most likely is. */
                result = STATE_UNKNOWN ;
                asprintf (&errmsg, "%s : Timeout from host %s\n", errmsg, address );
-                
+
        }
 
        /* if we had no read errors, check the printer status results... */
@@ -323,7 +322,7 @@ process_arguments (int argc, char **argv)
        if (argc < 2)
                return ERROR;
 
-       
+
        while (1) {
                c = getopt_long (argc, argv, "+hVH:C:", longopts, &option);
 
@@ -343,7 +342,7 @@ process_arguments (int argc, char **argv)
                        community = strscpy (community, optarg);
                        break;
                case 'V':                                                                       /* version */
-                       print_revision (progname, revision);
+                       print_revision (progname, NP_VERSION);
                        exit (STATE_OK);
                case 'h':                                                                       /* help */
                        print_help ();
@@ -362,7 +361,7 @@ process_arguments (int argc, char **argv)
                        usage2 (_("Invalid hostname/address"), argv[c]);
                }
        }
-       
+
        if (community == NULL) {
                if (argv[c] != NULL )
                        community = argv[c];
@@ -384,25 +383,32 @@ validate_arguments (void)
 void
 print_help (void)
 {
-       print_revision (progname, revision);
+       print_revision (progname, NP_VERSION);
 
        printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
        printf (COPYRIGHT, copyright, email);
 
        printf ("%s\n", _("This plugin tests the STATUS of an HP printer with a JetDirect card."));
-  printf ("%s\n", _("Net-snmp must be installed on the computer running the plugin."));
+       printf ("%s\n", _("Net-snmp must be installed on the computer running the plugin."));
 
-  printf ("\n\n");
+       printf ("\n\n");
 
        print_usage ();
 
        printf (_(UT_HELP_VRSN));
+       printf (_(UT_EXTRA_OPTS));
 
        printf (" %s\n", "-C, --community=STRING");
-  printf ("    %s", _("The SNMP community name "));
-  printf (_("(default=%s)"), DEFAULT_COMMUNITY);
+       printf ("    %s", _("The SNMP community name "));
+       printf (_("(default=%s)"), DEFAULT_COMMUNITY);
+       printf ("\n");
+
+#ifdef NP_EXTRA_OPTS
+       printf ("\n");
+       printf ("%s\n", _("Notes:"));
+       printf (_(UT_EXTRA_OPTS_NOTES));
+#endif
 
-  printf ("\n");
        printf (_(UT_SUPPORT));
 }