diff --git a/plugins/check_nt.c b/plugins/check_nt.c
index f142675614b78f1731e87afe634ebc870102c187..fa93fce745fb82ffb71b128586798c98bacd65fd 100644 (file)
--- a/plugins/check_nt.c
+++ b/plugins/check_nt.c
unsigned long utilization;
unsigned long uptime;
unsigned long age_in_minutes;
- double counter_value;
+ double counter_value = 0.0;
int offset=0;
int updays=0;
int uphours=0;
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
- if(process_arguments(argc,argv) != TRUE)
+ if(process_arguments(argc,argv) == ERROR)
usage4 (_("Could not parse arguments"));
/* initialize alarm signal handling */
{
/* Let's format the output string, finally... */
- asprintf (&output_message, "%s = %.2f %s", description, counter_value, counter_unit);
+ if (strstr(description, "%") == NULL) {
+ asprintf (&output_message, "%s = %.2f %s", description, counter_value, counter_unit);
+ } else {
+ /* has formatting, will segv if wrong */
+ asprintf (&output_message, description, counter_value);
+ }
output_message = strcat (output_message, "|");
output_message = strcat (output_message,
fperfdata (description, counter_value, counter_unit,
void print_help(void)
{
- print_revision(progname,"$Revision$");
- printf (_("\
-Copyright (c) 2000 Yves Rubin (rubiyz@yahoo.com)\n\n\
-This plugin collects data from the NSClient service running on a\n\
-Windows NT/2000/XP server.\n\n"));
+ print_revision(progname,revision);
+
+ printf ("Copyright (c) 2000 Yves Rubin (rubiyz@yahoo.com)\n");
+ printf (COPYRIGHT, copyright, email);
+
+ printf (_("This plugin collects data from the NSClient service running on a\n\
+Windows NT/2000/XP/2003 server.\n\n"));
+
print_usage();
+
printf (_("\nOptions:\n\
-H, --hostname=HOST\n\
Name of the host to check\n\
-h, --help\n\
Print this help screen\n\
-V, --version\n\
- Print version information\n"),
- PORT, DEFAULT_SOCKET_TIMEOUT);
+ Print version information\n"), PORT, DEFAULT_SOCKET_TIMEOUT);
+
printf (_("\
-v, --variable=STRING\n\
Variable to check. Valid variables are:\n"));
Request a -l parameters with the following syntax:\n\
-l \"\\\\<performance object>\\\\counter\",\"<description>\n\
The <description> parameter is optional and \n\
- is given to a printf output command which require a float parameters.\n\
+ is given to a printf output command which requires a float parameter.\n\
+ If <description> does not include \"%%\", it is used as a label.\n\
Some examples:\n\
\"Paging file usage is %%.2f %%%%\"\n\
\"%%.f %%%% paging file used.\"\n"));
void print_usage(void)
{
- printf(_("\
+ printf("\
Usage: %s -H host -v variable [-p port] [-w warning] [-c critical]\n\
- [-l params] [-d SHOWALL] [-t timeout]\n"), progname);
- printf (_(UT_HLP_VRS), progname, progname);
+ [-l params] [-d SHOWALL] [-t timeout]\n", progname);
}