Print optional text

git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@798 f882894a-f735-0410-b71e-b25c423dba1c

1 files changed, 13 insertions, 8 deletions

diff --git a/plugins/check_dummy.c b/plugins/check_dummy.c
index 9ca7a3ab..a8eae1a8 100644
--- a/plugins/check_dummy.c
+++ b/plugins/check_dummy.c
@@ -38,7 +38,7 @@ main (int argc, char **argv)
 	bindtextdomain (PACKAGE, LOCALEDIR);
 	textdomain (PACKAGE);
 
-	if (argc != 2)
+	if (argc < 2)
 		usage (_("Incorrect number of arguments supplied\n"));
 	else if (strcmp (argv[1], "-V") == 0 || strcmp (argv[1], "--version") == 0) {
 		print_revision (progname, revision);
@@ -55,22 +55,27 @@ main (int argc, char **argv)
 
 	switch (result) {
 	case STATE_OK:
-		printf ("Status is OK\n");
+		printf (_("OK"));
 		break;
 	case STATE_WARNING:
-		printf ("Status is at WARNING level\n");
+		printf (_("WARNING"));
 		break;
 	case STATE_CRITICAL:
-		printf ("Status is CRITICAL\n");
+		printf (_("CRITICAL"));
 		break;
 	case STATE_UNKNOWN:
-		printf ("Status is UNKNOWN\n");
+		printf (_("UNKNOWN"));
 		break;
 	default:
-		printf ("Status %d is not a supported error state\n", result);
+		printf (_("Status %d is not a supported error state\n"), result);
 		break;
 	}
 
+	if (argc >= 3) 
+		printf (": %s", argv[2]);
+
+	printf("\n");
+
 	return result;
 }
 
@@ -90,7 +95,7 @@ print_help (void)
 
 	printf (_("\n\
 This plugin will simply return the state corresponding to the numeric value\n\
-of the <state> argument.\n"));
+of the <state> argument with optional text.\n"));
 
 	printf (_(UT_SUPPORT));
 }
@@ -100,5 +105,5 @@ of the <state> argument.\n"));
 void
 print_usage (void)
 {
-	printf (_("Usage: %s <integer state>\n"), progname);
+	printf (_("Usage: %s <integer state> [optional text]\n"), progname);
 }