[Nagiosplug-checkins] CVS: nagiosplug/plugins check_dummy.c,1.6,1.7

[Ton Voon]

Update of /cvsroot/nagiosplug/nagiosplug/plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27334

Modified Files:
	check_dummy.c 
Log Message:
Print optional text


Index: check_dummy.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_dummy.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** check_dummy.c	22 Aug 2003 06:22:37 -0000	1.6
--- check_dummy.c	28 Jan 2004 11:42:39 -0000	1.7
***************
*** 39,43 ****
  	textdomain (PACKAGE);
  
! 	if (argc != 2)
  		usage (_("Incorrect number of arguments supplied\n"));
  	else if (strcmp (argv[1], "-V") == 0 || strcmp (argv[1], "--version") == 0) {
--- 39,43 ----
  	textdomain (PACKAGE);
  
! 	if (argc < 2)
  		usage (_("Incorrect number of arguments supplied\n"));
  	else if (strcmp (argv[1], "-V") == 0 || strcmp (argv[1], "--version") == 0) {
***************
*** 56,75 ****
  	switch (result) {
  	case STATE_OK:
! 		printf ("Status is OK\n");
  		break;
  	case STATE_WARNING:
! 		printf ("Status is at WARNING level\n");
  		break;
  	case STATE_CRITICAL:
! 		printf ("Status is CRITICAL\n");
  		break;
  	case STATE_UNKNOWN:
! 		printf ("Status is UNKNOWN\n");
  		break;
  	default:
! 		printf ("Status %d is not a supported error state\n", result);
  		break;
  	}
  
  	return result;
  }
--- 56,80 ----
  	switch (result) {
  	case STATE_OK:
! 		printf (_("OK"));
  		break;
  	case STATE_WARNING:
! 		printf (_("WARNING"));
  		break;
  	case STATE_CRITICAL:
! 		printf (_("CRITICAL"));
  		break;
  	case STATE_UNKNOWN:
! 		printf (_("UNKNOWN"));
  		break;
  	default:
! 		printf (_("Status %d is not a supported error state\n"), result);
  		break;
  	}
  
+ 	if (argc >= 3) 
+ 		printf (": %s", argv[2]);
+ 
+ 	printf("\n");
+ 
  	return result;
  }
***************
*** 91,95 ****
  	printf (_("\n\
  This plugin will simply return the state corresponding to the numeric value\n\
! of the <state> argument.\n"));
  
  	printf (_(UT_SUPPORT));
--- 96,100 ----
  	printf (_("\n\
  This plugin will simply return the state corresponding to the numeric value\n\
! of the <state> argument with optional text.\n"));
  
  	printf (_(UT_SUPPORT));
***************
*** 101,104 ****
  print_usage (void)
  {
! 	printf (_("Usage: %s <integer state>\n"), progname);
  }
--- 106,109 ----
  print_usage (void)
  {
! 	printf (_("Usage: %s <integer state> [optional text]\n"), progname);
  }