X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fcheck_dig.c;h=4394490e8723ea0fe31c2a0a5d71ca1b0eb022b4;hb=9ea5f808f64b044e76473795cd80c11edbf3eb17;hp=211c16c0cd3986bd09fa003c2ea8498a0f8b31dc;hpb=016d33230eb4fffd7e1f5644ce4901cb4d01f4e3;p=nagiosplug.git

diff --git a/plugins/check_dig.c b/plugins/check_dig.c
index 211c16c..4394490 100644
--- a/plugins/check_dig.c
+++ b/plugins/check_dig.c
@@ -20,7 +20,7 @@
 
 const char *progname = "check_dig";
 const char *revision = "$Revision$";
-const char *copyright = "2002-2003";
+const char *copyright = "2002-2004";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
 #include "common.h"
@@ -54,6 +54,7 @@ main (int argc, char **argv)
 	char input_buffer[MAX_INPUT_BUFFER];
 	char *command_line;
 	char *output;
+	char *t;
 	long microsec;
 	double elapsed_time;
 	int result = STATE_UNKNOWN;
@@ -68,7 +69,7 @@ main (int argc, char **argv)
 	if (signal (SIGALRM, popen_timeout_alarm_handler) == SIG_ERR)
 		usage4 (_("Cannot catch SIGALRM"));
 
-	if (process_arguments (argc, argv) != TRUE)
+	if (process_arguments (argc, argv) == ERROR)
 		usage4 (_("Could not parse arguments"));
 
 	/* get the command to run */
@@ -81,9 +82,9 @@ main (int argc, char **argv)
 	if (verbose) {
 		printf ("%s\n", command_line);
 		if(expected_address != NULL) {
-			printf ("Looking for: '%s'\n", expected_address);
+			printf (_("Looking for: '%s'\n"), expected_address);
 		} else {
-			printf ("Looking for: '%s'\n", query_address);
+			printf (_("Looking for: '%s'\n"), query_address);
 		}
 	}
 
@@ -124,6 +125,11 @@ main (int argc, char **argv)
                         	        result = STATE_OK;
 				}
 
+				/* Translate output TAB -> SPACE */
+				t = output;
+				while ((t = index(t, '\t')) != NULL) 
+					*t = ' ';
+
 			} while (!strstr (input_buffer, ";; "));
 
 			if (result == STATE_UNKNOWN) {
@@ -214,14 +220,12 @@ process_arguments (int argc, char **argv)
 
 		switch (c) {
 		case '?':									/* help */
-			printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
-			print_usage ();
-			exit (STATE_UNKNOWN);
+			usage2 (_("Unknown argument"), optarg);
 		case 'h':									/* help */
 			print_help ();
 			exit (STATE_OK);
 		case 'V':									/* version */
-			print_revision (progname, "$Revision$");
+			print_revision (progname, revision);
 			exit (STATE_OK);
 		case 'H':									/* hostname */
 			if (is_host (optarg)) {
@@ -336,7 +340,7 @@ print_help (void)
 
         printf (_("\
  -a, --expected_address=STRING\n\
-   an address expected to be in the asnwer section.\n\
+   an address expected to be in the answer section.\n\
    if not set, uses whatever was in -l\n"));
 
 	printf (_(UT_WARN_CRIT));
@@ -353,11 +357,8 @@ print_help (void)
 void
 print_usage (void)
 {
-	printf (_("\
+	printf ("\
 Usage: %s -H host -l lookup [-p <server port>] [-T <query type>]\n\
-         [-w <warning interval>] [-c <critical interval>] [-t <timeout>]\n\
-         [-a <expected answer address>] [-v]\n"),
-	        progname);
-	printf ("       %s (-h|--help)\n", progname);
-	printf ("       %s (-V|--version)\n", progname);
+                  [-w <warning interval>] [-c <critical interval>] [-t <timeout>]\n\
+                  [-a <expected answer address>] [-v]\n", progname);
 }