summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTon Voon <tonvoon@users.sourceforge.net>2004-11-24 00:46:40 +0000
committerTon Voon <tonvoon@users.sourceforge.net>2004-11-24 00:46:40 +0000
commit0c1c9f51e2c33db04918d2aa322fd1f9a688979b (patch)
treec7956483bce0deb4b73ca3a6b9d0b7f2e97620db
parent589d4664919638bedd6e2e1710c323887d19584a (diff)
downloadmonitoring-plugins-0c1c9f51e2c33db04918d2aa322fd1f9a688979b.tar.gz
Making messages more consistent
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@930 f882894a-f735-0410-b71e-b25c423dba1c
Diffstat
-rw-r--r--plugins/check_by_ssh.c2
-rw-r--r--plugins/check_dig.c4
-rw-r--r--plugins/check_disk.c6
-rw-r--r--plugins/check_dns.c8
-rw-r--r--plugins/check_dummy.c4
-rw-r--r--plugins/check_fping.c10
-rw-r--r--plugins/check_game.c4
-rw-r--r--plugins/check_hpjd.c8
-rw-r--r--plugins/check_http.c6
-rw-r--r--plugins/check_ldap.c6
-rw-r--r--plugins/check_load.c4
-rw-r--r--plugins/check_mrtg.c4
-rw-r--r--plugins/check_mrtgtraf.c4
-rw-r--r--plugins/check_mysql.c4
-rw-r--r--plugins/check_nwstat.c4
-rw-r--r--plugins/check_overcr.c4
-rw-r--r--plugins/check_pgsql.c4
-rw-r--r--plugins/check_ping.c7
-rw-r--r--plugins/check_procs.c6
-rw-r--r--plugins/check_radius.c12
-rw-r--r--plugins/check_real.c8
-rw-r--r--plugins/check_smtp.c8
-rw-r--r--plugins/check_snmp.c2
-rw-r--r--plugins/check_ssh.c8
-rw-r--r--plugins/check_tcp.c8
-rw-r--r--plugins/check_time.c10
-rw-r--r--plugins/check_udp.c10
-rw-r--r--plugins/check_ups.c8
-rw-r--r--plugins/check_users.c4
-rw-r--r--plugins/negate.c2
-rw-r--r--plugins/urlize.c4
31 files changed, 88 insertions, 95 deletions
diff --git a/plugins/check_by_ssh.c b/plugins/check_by_ssh.c
index 49794cc7..9500cb3d 100644
--- a/plugins/check_by_ssh.c
+++ b/plugins/check_by_ssh.c
@@ -297,7 +297,7 @@ process_arguments (int argc, char **argv)
297 if (c <= argc) { 297 if (c <= argc) {
298 die (STATE_UNKNOWN, _("%s: You must provide a host name\n"), progname); 298 die (STATE_UNKNOWN, _("%s: You must provide a host name\n"), progname);
299 } else if (!is_host (argv[c])) 299 } else if (!is_host (argv[c]))
300 die (STATE_UNKNOWN, _("%s: Invalid host name %s\n"), progname, argv[c]); 300 die (STATE_UNKNOWN, "%s: %s %s\n", progname, _("Invalid host name"), argv[c]);
301 hostname = argv[c++]; 301 hostname = argv[c++];
302 } 302 }
303 303
diff --git a/plugins/check_dig.c b/plugins/check_dig.c
index 41c445c5..92a5eda8 100644
--- a/plugins/check_dig.c
+++ b/plugins/check_dig.c
@@ -321,8 +321,8 @@ print_help (void)
321 321
322 print_revision (progname, revision); 322 print_revision (progname, revision);
323 323
324 printf (_("Copyright (c) 2000 Karl DeBisschop <kdebisschop@users.sourceforge.net>\n")); 324 printf ("Copyright (c) 2000 Karl DeBisschop <kdebisschop@users.sourceforge.net>\n");
325 printf (_(COPYRIGHT), copyright, email); 325 printf (COPYRIGHT, copyright, email);
326 326
327 printf (_("Test the DNS service on the specified host using dig\n\n")); 327 printf (_("Test the DNS service on the specified host using dig\n\n"));
328 328
diff --git a/plugins/check_disk.c b/plugins/check_disk.c
index 87596199..d8da02d6 100644
--- a/plugins/check_disk.c
+++ b/plugins/check_disk.c
@@ -304,7 +304,7 @@ process_arguments (int argc, char **argv)
304 break; 304 break;
305 } 305 }
306 else { 306 else {
307 usage (_("Timeout Interval must be an integer!\n")); 307 usage2 (_("Timeout interval must be a positive integer"), optarg);
308 } 308 }
309 case 'w': /* warning threshold */ 309 case 'w': /* warning threshold */
310 if (is_intnonneg (optarg)) { 310 if (is_intnonneg (optarg)) {
@@ -572,8 +572,8 @@ print_help (void)
572{ 572{
573 print_revision (progname, revision); 573 print_revision (progname, revision);
574 574
575 printf (_("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n")); 575 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
576 printf (_(COPYRIGHT), copyright, email); 576 printf (COPYRIGHT, copyright, email);
577 577
578 printf (_("\ 578 printf (_("\
579This plugin checks the amount of used disk space on a mounted file system\n\ 579This plugin checks the amount of used disk space on a mounted file system\n\
diff --git a/plugins/check_dns.c b/plugins/check_dns.c
index 39023f95..7b18270f 100644
--- a/plugins/check_dns.c
+++ b/plugins/check_dns.c
@@ -331,9 +331,7 @@ process_arguments (int argc, char **argv)
331 case 'r': /* reverse server name */ 331 case 'r': /* reverse server name */
332 /* TODO: Is this is_host necessary? */ 332 /* TODO: Is this is_host necessary? */
333 if (is_host (optarg) == FALSE) { 333 if (is_host (optarg) == FALSE) {
334 printf (_("Invalid host name/address\n\n")); 334 usage2 (_("Invalid host name/address"), optarg);
335 print_usage ();
336 exit (STATE_UNKNOWN);
337 } 335 }
338 if (strlen (optarg) >= ADDRESS_LENGTH) 336 if (strlen (optarg) >= ADDRESS_LENGTH)
339 die (STATE_UNKNOWN, _("Input buffer overflow\n")); 337 die (STATE_UNKNOWN, _("Input buffer overflow\n"));
@@ -391,8 +389,8 @@ print_help (void)
391{ 389{
392 print_revision (progname, revision); 390 print_revision (progname, revision);
393 391
394 printf (_("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n")); 392 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
395 printf (_(COPYRIGHT), copyright, email); 393 printf (COPYRIGHT, copyright, email);
396 394
397 print_usage (); 395 print_usage ();
398 396
diff --git a/plugins/check_dummy.c b/plugins/check_dummy.c
index a8eae1a8..7f508349 100644
--- a/plugins/check_dummy.c
+++ b/plugins/check_dummy.c
@@ -86,8 +86,8 @@ print_help (void)
86{ 86{
87 print_revision (progname, revision); 87 print_revision (progname, revision);
88 88
89 printf (_("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n")); 89 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
90 printf (_(COPYRIGHT), copyright, email); 90 printf (COPYRIGHT, copyright, email);
91 91
92 print_usage (); 92 print_usage ();
93 93
diff --git a/plugins/check_fping.c b/plugins/check_fping.c
index 1a536772..22f6b55d 100644
--- a/plugins/check_fping.c
+++ b/plugins/check_fping.c
@@ -80,7 +80,7 @@ main (int argc, char **argv)
80 /* run the command */ 80 /* run the command */
81 child_process = spopen (command_line); 81 child_process = spopen (command_line);
82 if (child_process == NULL) { 82 if (child_process == NULL) {
83 printf (_("Unable to open pipe: %s\n"), command_line); 83 printf (_("Could not open pipe: %s\n"), command_line);
84 return STATE_UNKNOWN; 84 return STATE_UNKNOWN;
85 } 85 }
86 86
@@ -254,9 +254,7 @@ process_arguments (int argc, char **argv)
254 break; 254 break;
255 case 'H': /* hostname */ 255 case 'H': /* hostname */
256 if (is_host (optarg) == FALSE) { 256 if (is_host (optarg) == FALSE) {
257 printf (_("Invalid host name/address\n\n")); 257 usage2 (_("Invalid host name/address"), optarg);
258 print_usage ();
259 exit (STATE_UNKNOWN);
260 } 258 }
261 server_name = strscpy (server_name, optarg); 259 server_name = strscpy (server_name, optarg);
262 break; 260 break;
@@ -362,8 +360,8 @@ print_help (void)
362 360
363 print_revision (progname, "$Revision$"); 361 print_revision (progname, "$Revision$");
364 362
365 printf (_("Copyright (c) 1999 Didi Rieder <adrieder@sbox.tu-graz.ac.at>\n")); 363 printf ("Copyright (c) 1999 Didi Rieder <adrieder@sbox.tu-graz.ac.at>\n");
366 printf (_(COPYRIGHT), copyright, email); 364 printf (COPYRIGHT, copyright, email);
367 365
368 printf (_("\ 366 printf (_("\
369This plugin will use the /bin/fping command (from saint) to ping the\n\ 367This plugin will use the /bin/fping command (from saint) to ping the\n\
diff --git a/plugins/check_game.c b/plugins/check_game.c
index ac72873d..511e9617 100644
--- a/plugins/check_game.c
+++ b/plugins/check_game.c
@@ -70,7 +70,7 @@ main (int argc, char **argv)
70 printf (_("Incorrect arguments supplied\n")); 70 printf (_("Incorrect arguments supplied\n"));
71 printf ("\n"); 71 printf ("\n");
72 print_revision (progname, revision); 72 print_revision (progname, revision);
73 printf (_("Copyright (c) 1999 Ian Cass, Knowledge Matters Limited\n")); 73 printf ("Copyright (c) 1999 Ian Cass, Knowledge Matters Limited\n");
74 printf (_("License: GPL\n")); 74 printf (_("License: GPL\n"));
75 printf ("\n"); 75 printf ("\n");
76 return STATE_UNKNOWN; 76 return STATE_UNKNOWN;
@@ -91,7 +91,7 @@ main (int argc, char **argv)
91 /* run the command */ 91 /* run the command */
92 fp = spopen (command_line); 92 fp = spopen (command_line);
93 if (fp == NULL) { 93 if (fp == NULL) {
94 printf (_("Error - Could not open pipe: %s\n"), command_line); 94 printf (_("Could not open pipe: %s\n"), command_line);
95 return STATE_UNKNOWN; 95 return STATE_UNKNOWN;
96 } 96 }
97 97
diff --git a/plugins/check_hpjd.c b/plugins/check_hpjd.c
index ec6bdf97..b124cceb 100644
--- a/plugins/check_hpjd.c
+++ b/plugins/check_hpjd.c
@@ -321,7 +321,7 @@ process_arguments (int argc, char **argv)
321 address = strscpy(address, optarg) ; 321 address = strscpy(address, optarg) ;
322 } 322 }
323 else { 323 else {
324 usage (_("Invalid host name\n")); 324 usage2 (_("Invalid host name"), optarg);
325 } 325 }
326 break; 326 break;
327 case 'C': /* community */ 327 case 'C': /* community */
@@ -344,7 +344,7 @@ process_arguments (int argc, char **argv)
344 address = argv[c++]; 344 address = argv[c++];
345 } 345 }
346 else { 346 else {
347 usage (_("Invalid host name")); 347 usage2 (_("Invalid host name"), argv[c]);
348 } 348 }
349 } 349 }
350 350
@@ -378,8 +378,8 @@ print_help (void)
378{ 378{
379 print_revision (progname, revision); 379 print_revision (progname, revision);
380 380
381 printf (_("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n")); 381 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
382 printf (_(COPYRIGHT), copyright, email); 382 printf (COPYRIGHT, copyright, email);
383 383
384 printf (_("\ 384 printf (_("\
385This plugin tests the STATUS of an HP printer with a JetDirect card.\n\ 385This plugin tests the STATUS of an HP printer with a JetDirect card.\n\
diff --git a/plugins/check_http.c b/plugins/check_http.c
index c48e97cd..0253f312 100644
--- a/plugins/check_http.c
+++ b/plugins/check_http.c
@@ -261,7 +261,7 @@ process_arguments (int argc, char **argv)
261 break; 261 break;
262 case 't': /* timeout period */ 262 case 't': /* timeout period */
263 if (!is_intnonneg (optarg)) 263 if (!is_intnonneg (optarg))
264 usage2 (_("timeout interval must be a non-negative integer"), optarg); 264 usage2 (_("Timeout interval must be a positive integer"), optarg);
265 else 265 else
266 socket_timeout = atoi (optarg); 266 socket_timeout = atoi (optarg);
267 break; 267 break;
@@ -1363,8 +1363,8 @@ print_help (void)
1363{ 1363{
1364 print_revision (progname, revision); 1364 print_revision (progname, revision);
1365 1365
1366 printf (_("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n")); 1366 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
1367 printf (_(COPYRIGHT), copyright, email); 1367 printf (COPYRIGHT, copyright, email);
1368 1368
1369 printf (_("\ 1369 printf (_("\
1370This plugin tests the HTTP service on the specified host. It can test\n\ 1370This plugin tests the HTTP service on the specified host. It can test\n\
diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c
index 207b98ed..69874117 100644
--- a/plugins/check_ldap.c
+++ b/plugins/check_ldap.c
@@ -195,7 +195,7 @@ process_arguments (int argc, char **argv)
195 exit (STATE_OK); 195 exit (STATE_OK);
196 case 't': /* timeout period */ 196 case 't': /* timeout period */
197 if (!is_intnonneg (optarg)) 197 if (!is_intnonneg (optarg))
198 usage2 (_("timeout interval must be a positive integer"), optarg); 198 usage2 (_("Timeout interval must be a positive integer"), optarg);
199 else 199 else
200 socket_timeout = atoi (optarg); 200 socket_timeout = atoi (optarg);
201 break; 201 break;
@@ -283,8 +283,8 @@ print_help (void)
283 283
284 print_revision (progname, revision); 284 print_revision (progname, revision);
285 285
286 printf (_("Copyright (c) 1999 Didi Rieder (adrieder@sbox.tu-graz.ac.at)\n")); 286 printf ("Copyright (c) 1999 Didi Rieder (adrieder@sbox.tu-graz.ac.at)\n");
287 printf (_(COPYRIGHT), copyright, email); 287 printf (COPYRIGHT, copyright, email);
288 288
289 print_usage (); 289 print_usage ();
290 290
diff --git a/plugins/check_load.c b/plugins/check_load.c
index fc7e9496..956f9077 100644
--- a/plugins/check_load.c
+++ b/plugins/check_load.c
@@ -303,8 +303,8 @@ print_help (void)
303{ 303{
304 print_revision (progname, revision); 304 print_revision (progname, revision);
305 305
306 printf (_("Copyright (c) 1999 Felipe Gustavo de Almeida <galmeida@linux.ime.usp.br>\n")); 306 printf ("Copyright (c) 1999 Felipe Gustavo de Almeida <galmeida@linux.ime.usp.br>\n");
307 printf (_(COPYRIGHT), copyright, email); 307 printf (COPYRIGHT, copyright, email);
308 308
309 printf (_("This plugin tests the current system load average.\n\n")); 309 printf (_("This plugin tests the current system load average.\n\n"));
310 310
diff --git a/plugins/check_mrtg.c b/plugins/check_mrtg.c
index 15d50fea..5532389c 100644
--- a/plugins/check_mrtg.c
+++ b/plugins/check_mrtg.c
@@ -308,8 +308,8 @@ print_help (void)
308{ 308{
309 print_revision (progname, revision); 309 print_revision (progname, revision);
310 310
311 printf (_("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n")); 311 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
312 printf (_(COPYRIGHT), copyright, email); 312 printf (COPYRIGHT, copyright, email);
313 313
314 printf(_("\ 314 printf(_("\
315This plugin will check either the average or maximum value of one of the\n\ 315This plugin will check either the average or maximum value of one of the\n\
diff --git a/plugins/check_mrtgtraf.c b/plugins/check_mrtgtraf.c
index 6b323426..a5455b04 100644
--- a/plugins/check_mrtgtraf.c
+++ b/plugins/check_mrtgtraf.c
@@ -320,8 +320,8 @@ print_help (void)
320{ 320{
321 print_revision (progname, revision); 321 print_revision (progname, revision);
322 322
323 printf (_("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n")); 323 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
324 printf (_(COPYRIGHT), copyright, email); 324 printf (COPYRIGHT, copyright, email);
325 325
326 print_usage (); 326 print_usage ();
327 327
diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
index dba43c5f..deac37fc 100644
--- a/plugins/check_mysql.c
+++ b/plugins/check_mysql.c
@@ -183,7 +183,7 @@ process_arguments (int argc, char **argv)
183 db_host = optarg; 183 db_host = optarg;
184 } 184 }
185 else { 185 else {
186 usage (_("Invalid host name\n")); 186 usage2 (_("Invalid host name"), optarg);
187 } 187 }
188 break; 188 break;
189 case 'd': /* hostname */ 189 case 'd': /* hostname */
@@ -221,7 +221,7 @@ process_arguments (int argc, char **argv)
221 db_host = argv[c++]; 221 db_host = argv[c++];
222 } 222 }
223 else { 223 else {
224 usage ("Invalid host name"); 224 usage2 (_("Invalid host name"), optarg);
225 } 225 }
226 else if (strlen(db_user) == 0) 226 else if (strlen(db_user) == 0)
227 db_user = argv[c++]; 227 db_user = argv[c++];
diff --git a/plugins/check_nwstat.c b/plugins/check_nwstat.c
index dc8ce210..765a4fb6 100644
--- a/plugins/check_nwstat.c
+++ b/plugins/check_nwstat.c
@@ -906,8 +906,8 @@ void print_help(void)
906 906
907 print_revision (progname, revision); 907 print_revision (progname, revision);
908 908
909 printf (_("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n")); 909 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
910 printf (_(COPYRIGHT), copyright, email); 910 printf (COPYRIGHT, copyright, email);
911 911
912 printf (_("\ 912 printf (_("\
913Usage: %s This plugin attempts to contact the MRTGEXT NLM running\n\ 913Usage: %s This plugin attempts to contact the MRTGEXT NLM running\n\
diff --git a/plugins/check_overcr.c b/plugins/check_overcr.c
index 581db50f..0b524ff7 100644
--- a/plugins/check_overcr.c
+++ b/plugins/check_overcr.c
@@ -420,8 +420,8 @@ print_help (void)
420 420
421 print_revision (progname, revision); 421 print_revision (progname, revision);
422 422
423 printf (_("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n")); 423 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
424 printf (_(COPYRIGHT), copyright, email); 424 printf (COPYRIGHT, copyright, email);
425 425
426 printf (_("\ 426 printf (_("\
427This plugin attempts to contact the Over-CR collector daemon running on the\n\ 427This plugin attempts to contact the Over-CR collector daemon running on the\n\
diff --git a/plugins/check_pgsql.c b/plugins/check_pgsql.c
index 22a5b811..07abd9c0 100644
--- a/plugins/check_pgsql.c
+++ b/plugins/check_pgsql.c
@@ -216,7 +216,7 @@ process_arguments (int argc, char **argv)
216 exit (STATE_OK); 216 exit (STATE_OK);
217 case 't': /* timeout period */ 217 case 't': /* timeout period */
218 if (!is_integer (optarg)) 218 if (!is_integer (optarg))
219 usage2 (_("Timeout Interval must be an integer"), optarg); 219 usage2 (_("Timeout interval must be a positive integer"), optarg);
220 else 220 else
221 timeout_interval = atoi (optarg); 221 timeout_interval = atoi (optarg);
222 break; 222 break;
@@ -234,7 +234,7 @@ process_arguments (int argc, char **argv)
234 break; 234 break;
235 case 'H': /* host */ 235 case 'H': /* host */
236 if (!is_host (optarg)) 236 if (!is_host (optarg))
237 usage2 (_("You gave an invalid host name"), optarg); 237 usage2 (_("Invalid host name"), optarg);
238 else 238 else
239 pghost = optarg; 239 pghost = optarg;
240 break; 240 break;
diff --git a/plugins/check_ping.c b/plugins/check_ping.c
index 2d7e24d4..074519d3 100644
--- a/plugins/check_ping.c
+++ b/plugins/check_ping.c
@@ -270,8 +270,7 @@ process_arguments (int argc, char **argv)
270 270
271 if (addresses[0] == NULL) { 271 if (addresses[0] == NULL) {
272 if (is_host (argv[c]) == FALSE) { 272 if (is_host (argv[c]) == FALSE) {
273 printf (_("Invalid host name/address: %s\n\n"), argv[c]); 273 usage2 (_("Invalid host name/address"), argv[c]);
274 return ERROR;
275 } else { 274 } else {
276 addresses[0] = argv[c++]; 275 addresses[0] = argv[c++];
277 n_addresses++; 276 n_addresses++;
@@ -506,8 +505,8 @@ print_help (void)
506{ 505{
507 print_revision (progname, revision); 506 print_revision (progname, revision);
508 507
509 printf (_("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>")); 508 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>");
510 printf (_(COPYRIGHT), copyright, email); 509 printf (COPYRIGHT, copyright, email);
511 510
512 printf (_("Use ping to check connection statistics for a remote host.\n\n")); 511 printf (_("Use ping to check connection statistics for a remote host.\n\n"));
513 512
diff --git a/plugins/check_procs.c b/plugins/check_procs.c
index 3eefdb44..d39bfa54 100644
--- a/plugins/check_procs.c
+++ b/plugins/check_procs.c
@@ -348,7 +348,7 @@ process_arguments (int argc, char **argv)
348 exit (STATE_OK); 348 exit (STATE_OK);
349 case 't': /* timeout period */ 349 case 't': /* timeout period */
350 if (!is_integer (optarg)) 350 if (!is_integer (optarg))
351 usage (_("Timeout Interval must be an integer!\n\n")); 351 usage2 (_("Timeout interval must be a positive integer"), optarg);
352 else 352 else
353 timeout_interval = atoi (optarg); 353 timeout_interval = atoi (optarg);
354 break; 354 break;
@@ -588,8 +588,8 @@ print_help (void)
588{ 588{
589 print_revision (progname, revision); 589 print_revision (progname, revision);
590 590
591 printf (_("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>")); 591 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>");
592 printf (_(COPYRIGHT), copyright, email); 592 printf (COPYRIGHT, copyright, email);
593 593
594 printf(_("\ 594 printf(_("\
595Checks all processes and generates WARNING or CRITICAL states if the specified\n\ 595Checks all processes and generates WARNING or CRITICAL states if the specified\n\
diff --git a/plugins/check_radius.c b/plugins/check_radius.c
index ece17943..725cf9f8 100644
--- a/plugins/check_radius.c
+++ b/plugins/check_radius.c
@@ -190,7 +190,7 @@ process_arguments (int argc, char **argv)
190 if (is_intpos (argv[4])) 190 if (is_intpos (argv[4]))
191 timeout_interval = atoi (argv[4]); 191 timeout_interval = atoi (argv[4]);
192 else 192 else
193 usage (_("Timeout interval must be a positive integer")); 193 usage2 (_("Timeout interval must be a positive integer"), optarg);
194 if (is_intpos (argv[5])) 194 if (is_intpos (argv[5]))
195 retries = atoi (argv[5]); 195 retries = atoi (argv[5]);
196 else 196 else
@@ -227,9 +227,7 @@ process_arguments (int argc, char **argv)
227 break; 227 break;
228 case 'H': /* hostname */ 228 case 'H': /* hostname */
229 if (is_host (optarg) == FALSE) { 229 if (is_host (optarg) == FALSE) {
230 printf (_("Invalid host name/address\n\n")); 230 usage2 (_("Invalid host name/address"), optarg);
231 print_usage ();
232 exit (STATE_UNKNOWN);
233 } 231 }
234 server = optarg; 232 server = optarg;
235 break; 233 break;
@@ -264,7 +262,7 @@ process_arguments (int argc, char **argv)
264 if (is_intpos (optarg)) 262 if (is_intpos (optarg))
265 timeout_interval = atoi (optarg); 263 timeout_interval = atoi (optarg);
266 else 264 else
267 usage (_("Timeout interval must be a positive integer")); 265 usage2 (_("Timeout interval must be a positive integer"), optarg);
268 break; 266 break;
269 } 267 }
270 } 268 }
@@ -284,8 +282,8 @@ print_help (void)
284 282
285 print_revision (progname, revision); 283 print_revision (progname, revision);
286 284
287 printf (_("Copyright (c) 1999 Robert August Vincent II\n")); 285 printf ("Copyright (c) 1999 Robert August Vincent II\n");
288 printf (_(COPYRIGHT), copyright, email); 286 printf (COPYRIGHT, copyright, email);
289 287
290 printf(_("Tests to see if a radius server is accepting connections.\n\n")); 288 printf(_("Tests to see if a radius server is accepting connections.\n\n"));
291 289
diff --git a/plugins/check_real.c b/plugins/check_real.c
index 7cd17eea..755f6eb2 100644
--- a/plugins/check_real.c
+++ b/plugins/check_real.c
@@ -303,7 +303,7 @@ process_arguments (int argc, char **argv)
303 else if (is_host (optarg)) 303 else if (is_host (optarg))
304 server_address = optarg; 304 server_address = optarg;
305 else 305 else
306 usage (_("Invalid host name\n")); 306 usage2 (_("Invalid host name"), optarg);
307 break; 307 break;
308 case 'e': /* string to expect in response header */ 308 case 'e': /* string to expect in response header */
309 server_expect = optarg; 309 server_expect = optarg;
@@ -365,7 +365,7 @@ process_arguments (int argc, char **argv)
365 server_address = argv[c++]; 365 server_address = argv[c++];
366 } 366 }
367 else { 367 else {
368 usage (_("Invalid host name")); 368 usage2 (_("Invalid host name"), argv[c]);
369 } 369 }
370 } 370 }
371 371
@@ -403,8 +403,8 @@ print_help (void)
403 403
404 print_revision (progname, "$Revision$"); 404 print_revision (progname, "$Revision$");
405 405
406 printf (_("Copyright (c) 1999 Pedro Leite <leite@cic.ua.pt>\n")); 406 printf ("Copyright (c) 1999 Pedro Leite <leite@cic.ua.pt>\n");
407 printf (_(COPYRIGHT), copyright, email); 407 printf (COPYRIGHT, copyright, email);
408 408
409 printf (_("This plugin tests the REAL service on the specified host.\n\n")); 409 printf (_("This plugin tests the REAL service on the specified host.\n\n"));
410 410
diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c
index f6f347c4..ae3f88b1 100644
--- a/plugins/check_smtp.c
+++ b/plugins/check_smtp.c
@@ -292,7 +292,7 @@ process_arguments (int argc, char **argv)
292 server_address = optarg; 292 server_address = optarg;
293 } 293 }
294 else { 294 else {
295 usage (_("Invalid host name\n")); 295 usage2 (_("Invalid host name"), optarg);
296 } 296 }
297 break; 297 break;
298 case 'p': /* port */ 298 case 'p': /* port */
@@ -384,7 +384,7 @@ process_arguments (int argc, char **argv)
384 if (is_host (argv[c])) 384 if (is_host (argv[c]))
385 server_address = argv[c]; 385 server_address = argv[c];
386 else 386 else
387 usage (_("Invalid host name")); 387 usage2 (_("Invalid host name"), argv[c]);
388 } 388 }
389 else { 389 else {
390 asprintf (&server_address, "127.0.0.1"); 390 asprintf (&server_address, "127.0.0.1");
@@ -426,8 +426,8 @@ print_help (void)
426 426
427 print_revision (progname, revision); 427 print_revision (progname, revision);
428 428
429 printf (_("Copyright (c) 1999-2001 Ethan Galstad <nagios@nagios.org>\n")); 429 printf ("Copyright (c) 1999-2001 Ethan Galstad <nagios@nagios.org>\n");
430 printf (_(COPYRIGHT), copyright, email); 430 printf (COPYRIGHT, copyright, email);
431 431
432 printf(_("\ 432 printf(_("\
433This plugin will attempt to open an SMTP connection with the host.\n\n")); 433This plugin will attempt to open an SMTP connection with the host.\n\n"));
diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index 907c1809..11ea9559 100644
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
@@ -446,7 +446,7 @@ process_arguments (int argc, char **argv)
446 break; 446 break;
447 case 't': /* timeout period */ 447 case 't': /* timeout period */
448 if (!is_integer (optarg)) 448 if (!is_integer (optarg))
449 usage2 (_("Timeout Interval must be an integer"), optarg); 449 usage2 (_("Timeout interval must be a positive integer"), optarg);
450 else 450 else
451 timeout_interval = atoi (optarg); 451 timeout_interval = atoi (optarg);
452 break; 452 break;
diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c
index 79e17017..6e0b0f17 100644
--- a/plugins/check_ssh.c
+++ b/plugins/check_ssh.c
@@ -114,7 +114,7 @@ process_arguments (int argc, char **argv)
114 break; 114 break;
115 case 't': /* timeout period */ 115 case 't': /* timeout period */
116 if (!is_integer (optarg)) 116 if (!is_integer (optarg))
117 usage (_("Timeout Interval must be an integer!\n\n")); 117 usage2 (_("Timeout interval must be a positive integer"), optarg);
118 else 118 else
119 socket_timeout = atoi (optarg); 119 socket_timeout = atoi (optarg);
120 break; 120 break;
@@ -130,7 +130,7 @@ process_arguments (int argc, char **argv)
130 break; 130 break;
131 case 'H': /* host */ 131 case 'H': /* host */
132 if (is_host (optarg) == FALSE) 132 if (is_host (optarg) == FALSE)
133 usage ("Invalid hostname/address\n"); 133 usage2 (_("Invalid host name/address"), optarg);
134 server_name = optarg; 134 server_name = optarg;
135 break; 135 break;
136 case 'p': /* port */ 136 case 'p': /* port */
@@ -233,8 +233,8 @@ print_help (void)
233 233
234 print_revision (progname, revision); 234 print_revision (progname, revision);
235 235
236 printf (_("Copyright (c) 1999 Remi Paulmier <remi@sinfomic.fr>\n")); 236 printf ("Copyright (c) 1999 Remi Paulmier <remi@sinfomic.fr>\n");
237 printf (_(COPYRIGHT), copyright, email); 237 printf (COPYRIGHT, copyright, email);
238 238
239 printf (_("Try to connect to SSH server at specified server and port\n\n")); 239 printf (_("Try to connect to SSH server at specified server and port\n\n"));
240 240
diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c
index 126907f9..b78bf34d 100644
--- a/plugins/check_tcp.c
+++ b/plugins/check_tcp.c
@@ -429,7 +429,7 @@ process_arguments (int argc, char **argv)
429 break; 429 break;
430 case 'H': /* hostname */ 430 case 'H': /* hostname */
431 if (is_host (optarg) == FALSE) 431 if (is_host (optarg) == FALSE)
432 usage2 (_("invalid host name or address"), optarg); 432 usage2 (_("Invalid host name/address"), optarg);
433 server_address = optarg; 433 server_address = optarg;
434 break; 434 break;
435 case 'c': /* critical */ 435 case 'c': /* critical */
@@ -459,7 +459,7 @@ process_arguments (int argc, char **argv)
459 break; 459 break;
460 case 't': /* timeout */ 460 case 't': /* timeout */
461 if (!is_intpos (optarg)) 461 if (!is_intpos (optarg))
462 usage (_("Timeout interval must be a positive integer\n")); 462 usage2 (_("Timeout interval must be a positive integer"), optarg);
463 else 463 else
464 socket_timeout = atoi (optarg); 464 socket_timeout = atoi (optarg);
465 break; 465 break;
@@ -603,8 +603,8 @@ print_help (void)
603{ 603{
604 print_revision (progname, revision); 604 print_revision (progname, revision);
605 605
606 printf (_("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n")); 606 printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
607 printf (_(COPYRIGHT), copyright, email); 607 printf (COPYRIGHT, copyright, email);
608 608
609 printf (_("This plugin tests %s connections with the specified host.\n\n"), 609 printf (_("This plugin tests %s connections with the specified host.\n\n"),
610 SERVICE); 610 SERVICE);
diff --git a/plugins/check_time.c b/plugins/check_time.c
index 1f8b3bd8..314b7683 100644
--- a/plugins/check_time.c
+++ b/plugins/check_time.c
@@ -226,7 +226,7 @@ process_arguments (int argc, char **argv)
226 exit (STATE_OK); 226 exit (STATE_OK);
227 case 'H': /* hostname */ 227 case 'H': /* hostname */
228 if (is_host (optarg) == FALSE) 228 if (is_host (optarg) == FALSE)
229 usage (_("Invalid host name/address\n")); 229 usage2 (_("Invalid host name/address"), optarg);
230 server_address = optarg; 230 server_address = optarg;
231 break; 231 break;
232 case 'w': /* warning-variance */ 232 case 'w': /* warning-variance */
@@ -288,7 +288,7 @@ process_arguments (int argc, char **argv)
288 break; 288 break;
289 case 't': /* timeout */ 289 case 't': /* timeout */
290 if (!is_intnonneg (optarg)) 290 if (!is_intnonneg (optarg))
291 usage (_("Timeout interval must be a nonnegative integer\n")); 291 usage2 (_("Timeout interval must be a positive integer"), optarg);
292 else 292 else
293 socket_timeout = atoi (optarg); 293 socket_timeout = atoi (optarg);
294 break; 294 break;
@@ -301,7 +301,7 @@ process_arguments (int argc, char **argv)
301 if (server_address == NULL) { 301 if (server_address == NULL) {
302 if (argc > c) { 302 if (argc > c) {
303 if (is_host (argv[c]) == FALSE) 303 if (is_host (argv[c]) == FALSE)
304 usage (_("Invalid host name/address\n")); 304 usage2 (_("Invalid host name/address"), optarg);
305 server_address = argv[c]; 305 server_address = argv[c];
306 } 306 }
307 else { 307 else {
@@ -325,8 +325,8 @@ print_help (void)
325 325
326 print_revision (progname, revision); 326 print_revision (progname, revision);
327 327
328 printf (_("Copyright (c) 1999 Ethan Galstad\n")); 328 printf ("Copyright (c) 1999 Ethan Galstad\n");
329 printf (_(COPYRIGHT), copyright, email); 329 printf (COPYRIGHT, copyright, email);
330 330
331 printf (_("\ 331 printf (_("\
332This plugin will check the time on the specified host.\n\n")); 332This plugin will check the time on the specified host.\n\n"));
diff --git a/plugins/check_udp.c b/plugins/check_udp.c
index c4fbbf85..05ade04e 100644
--- a/plugins/check_udp.c
+++ b/plugins/check_udp.c
@@ -158,7 +158,7 @@ process_arguments (int argc, char **argv)
158 break; 158 break;
159 case 'H': /* hostname */ 159 case 'H': /* hostname */
160 if (is_host (optarg) == FALSE) 160 if (is_host (optarg) == FALSE)
161 usage (_("Invalid host name/address\n")); 161 usage2 (_("Invalid host name/address"), optarg);
162 server_address = optarg; 162 server_address = optarg;
163 break; 163 break;
164 case 'c': /* critical */ 164 case 'c': /* critical */
@@ -177,7 +177,7 @@ process_arguments (int argc, char **argv)
177 break; 177 break;
178 case 't': /* timeout */ 178 case 't': /* timeout */
179 if (!is_intnonneg (optarg)) 179 if (!is_intnonneg (optarg))
180 usage (_("Timeout interval must be a nonnegative integer\n")); 180 usage2 (_("Timeout interval must be a positive integer"), optarg);
181 else 181 else
182 socket_timeout = atoi (optarg); 182 socket_timeout = atoi (optarg);
183 break; 183 break;
@@ -199,7 +199,7 @@ process_arguments (int argc, char **argv)
199 c = optind; 199 c = optind;
200 if (server_address == NULL && c < argc && argv[c]) { 200 if (server_address == NULL && c < argc && argv[c]) {
201 if (is_host (argv[c]) == FALSE) 201 if (is_host (argv[c]) == FALSE)
202 usage (_("Invalid host name/address\n")); 202 usage2 (_("Invalid host name/address"), optarg);
203 server_address = argv[c++]; 203 server_address = argv[c++];
204 } 204 }
205 205
@@ -222,8 +222,8 @@ print_help (void)
222{ 222{
223 print_revision (progname, revision); 223 print_revision (progname, revision);
224 224
225 printf (_("Copyright (c) 1999 Ethan Galstad\n")); 225 printf ("Copyright (c) 1999 Ethan Galstad\n");
226 printf (_(COPYRIGHT), copyright, email); 226 printf (COPYRIGHT, copyright, email);
227 227
228 printf (_("\ 228 printf (_("\
229This plugin tests an UDP connection with the specified host.\n\n")); 229This plugin tests an UDP connection with the specified host.\n\n"));
diff --git a/plugins/check_ups.c b/plugins/check_ups.c
index f88e9e9f..33cba770 100644
--- a/plugins/check_ups.c
+++ b/plugins/check_ups.c
@@ -472,7 +472,7 @@ process_arguments (int argc, char **argv)
472 server_address = optarg; 472 server_address = optarg;
473 } 473 }
474 else { 474 else {
475 usage2 ("Invalid host name", optarg); 475 usage2 (_("Invalid host name"), optarg);
476 } 476 }
477 break; 477 break;
478 case 'u': /* ups name */ 478 case 'u': /* ups name */
@@ -538,7 +538,7 @@ process_arguments (int argc, char **argv)
538 if (is_host (argv[optind])) 538 if (is_host (argv[optind]))
539 server_address = argv[optind++]; 539 server_address = argv[optind++];
540 else 540 else
541 usage ("Invalid host name"); 541 usage2 (_("Invalid host name"), optarg);
542 } 542 }
543 543
544 if (server_address == NULL) 544 if (server_address == NULL)
@@ -570,8 +570,8 @@ print_help (void)
570 570
571 print_revision (progname, revision); 571 print_revision (progname, revision);
572 572
573 printf (_("Copyright (c) 2000 Tom Shields")); 573 printf ("Copyright (c) 2000 Tom Shields");
574 printf (_(COPYRIGHT), copyright, email); 574 printf (COPYRIGHT, copyright, email);
575 575
576 printf (_("This plugin tests the UPS service on the specified host.\n\ 576 printf (_("This plugin tests the UPS service on the specified host.\n\
577Network UPS Tools from www.exploits.org must be running for this plugin to\n\ 577Network UPS Tools from www.exploits.org must be running for this plugin to\n\
diff --git a/plugins/check_users.c b/plugins/check_users.c
index e0a71845..377a11a6 100644
--- a/plugins/check_users.c
+++ b/plugins/check_users.c
@@ -192,8 +192,8 @@ print_help (void)
192{ 192{
193 print_revision (progname, revision); 193 print_revision (progname, revision);
194 194
195 printf (_("Copyright (c) 1999 Ethan Galstad\n")); 195 printf ("Copyright (c) 1999 Ethan Galstad\n");
196 printf (_(COPYRIGHT), copyright, email); 196 printf (COPYRIGHT, copyright, email);
197 197
198 printf (_("\ 198 printf (_("\
199This plugin checks the number of users currently logged in on the local\n\ 199This plugin checks the number of users currently logged in on the local\n\
diff --git a/plugins/negate.c b/plugins/negate.c
index 3dd3411f..a71f1b67 100644
--- a/plugins/negate.c
+++ b/plugins/negate.c
@@ -180,7 +180,7 @@ process_arguments (int argc, char **argv)
180 exit (EXIT_SUCCESS); 180 exit (EXIT_SUCCESS);
181 case 't': /* timeout period */ 181 case 't': /* timeout period */
182 if (!is_integer (optarg)) 182 if (!is_integer (optarg))
183 usage2 (_("Timeout Interval must be an integer"), optarg); 183 usage2 (_("Timeout interval must be a positive integer"), optarg);
184 else 184 else
185 timeout_interval = atoi (optarg); 185 timeout_interval = atoi (optarg);
186 break; 186 break;
diff --git a/plugins/urlize.c b/plugins/urlize.c
index 141cc84a..337a91f2 100644
--- a/plugins/urlize.c
+++ b/plugins/urlize.c
@@ -129,8 +129,8 @@ print_help (void)
129{ 129{
130 print_revision (progname, revision); 130 print_revision (progname, revision);
131 131
132 printf (_("Copyright (c) 2000 Karl DeBisschop <kdebisschop@users.sourceforge.net>\n")); 132 printf ("Copyright (c) 2000 Karl DeBisschop <kdebisschop@users.sourceforge.net>\n");
133 printf (_(COPYRIGHT), copyright, email); 133 printf (COPYRIGHT, copyright, email);
134 134
135 printf (_("\n\ 135 printf (_("\n\
136This plugin wraps the text output of another command (plugin) in HTML\n\ 136This plugin wraps the text output of another command (plugin) in HTML\n\