[Nagiosplug-checkins] CVS: nagiosplug/plugins check_users.c,1.5,1.6 urlize.c,1.6,1.7

[Karl DeBisschop]

Update of /cvsroot/nagiosplug/nagiosplug/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv14796

Modified Files:
	check_users.c urlize.c 
Log Message:
markup for translation

Index: check_users.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_users.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** check_users.c	17 Apr 2003 05:55:25 -0000	1.5
--- check_users.c	4 Aug 2003 11:38:27 -0000	1.6
***************
*** 1,48 ****
  /*****************************************************************************
! *
! * This program is free software; you can redistribute it and/or modify
! * it under the terms of the GNU General Public License as published by
! * the Free Software Foundation; either version 2 of the License, or
! * (at your option) any later version.
! *
! * This program is distributed in the hope that it will be useful,
! * but WITHOUT ANY WARRANTY; without even the implied warranty of
! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
! * GNU General Public License for more details.
! *
! * You should have received a copy of the GNU General Public License
! * along with this program; if not, write to the Free Software
! * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
! *
  *****************************************************************************/
  
  #include "common.h"
  #include "popen.h"
  #include "utils.h"
  
! const char *progname = "check_users";
! const char *revision = "$Revision$";
! const char *copyright = "2002-2003";
! const char *authors = "Nagios Plugin Development Team";
! const char *email = "nagiosplug-devel at lists.sourceforge.net";
  
! const char *summary = "\
  This plugin checks the number of users currently logged in on the local\n\
! system and generates an error if the number exceeds the thresholds specified.\n";
  
! const char *option_summary = "-w <users> -c <users>";
  
! const char *options = "\
   -w, --warning=INTEGER\n\
      Set WARNING status if more than INTEGER users are logged in\n\
   -c, --critical=INTEGER\n\
!     Set CRITICAL status if more than INTEGER users are logged in\n";
! 
! const char *standard_options = "\
!  -h, --help\n\
!     Print detailed help screen\n\
!  -V, --version\n\
!     Print version information\n\n";
  
  #define possibly_set(a,b) ((a) == 0 ? (b) : 0)
  
--- 1,61 ----
  /*****************************************************************************
! 
!  This program is free software; you can redistribute it and/or modify
!  it under the terms of the GNU General Public License as published by
!  the Free Software Foundation; either version 2 of the License, or
!  (at your option) any later version.
! 
!  This program is distributed in the hope that it will be useful,
!  but WITHOUT ANY WARRANTY; without even the implied warranty of
!  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!  GNU General Public License for more details.
! 
!  You should have received a copy of the GNU General Public License
!  along with this program; if not, write to the Free Software
!  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
! 
  *****************************************************************************/
  
+ const char *progname = "check_users";
+ const char *revision = "$Revision$";
+ const char *copyright = "2000-2003";
+ const char *email = "nagiosplug-devel at lists.sourceforge.net";
+ 
  #include "common.h"
  #include "popen.h"
  #include "utils.h"
  
! void
! print_usage (void)
! {
! 	printf ("Usage: %s -w <users> -c <users>\n", progname);
! 	printf (_(UT_HLP_VRS), progname, progname);
! }
  
! void
! print_help (void)
! {
! 	print_revision (progname, revision);
! 
! 	printf (_("Copyright (c) 1999 Ethan Galstad\n"));
! 	printf (_(COPYRIGHT), copyright, email);
! 
! 	printf (_("\
  This plugin checks the number of users currently logged in on the local\n\
! system and generates an error if the number exceeds the thresholds specified.\n"));
  
! 	print_usage ();
  
! 	printf (_(UT_HELP_VRSN));
! 
! 	printf (_("\
   -w, --warning=INTEGER\n\
      Set WARNING status if more than INTEGER users are logged in\n\
   -c, --critical=INTEGER\n\
!     Set CRITICAL status if more than INTEGER users are logged in\n"));
  
+ 	printf (_(UT_SUPPORT));
+ }
+ 
  #define possibly_set(a,b) ((a) == 0 ? (b) : 0)
  
***************
*** 62,71 ****
  
  	if (process_arguments (argc, argv) == ERROR)
! 		usage ("Could not parse arguments\n");
  
  	/* run the command */
  	child_process = spopen (WHO_COMMAND);
  	if (child_process == NULL) {
! 		printf ("Could not open pipe: %s\n", WHO_COMMAND);
  		return STATE_UNKNOWN;
  	}
--- 75,84 ----
  
  	if (process_arguments (argc, argv) == ERROR)
! 		usage (_("Could not parse arguments\n"));
  
  	/* run the command */
  	child_process = spopen (WHO_COMMAND);
  	if (child_process == NULL) {
! 		printf (_("Could not open pipe: %s\n"), WHO_COMMAND);
  		return STATE_UNKNOWN;
  	}
***************
*** 73,77 ****
  	child_stderr = fdopen (child_stderr_array[fileno (child_process)], "r");
  	if (child_stderr == NULL)
! 		printf ("Could not open stderr for %s\n", WHO_COMMAND);
  
  	users = 0;
--- 86,90 ----
  	child_stderr = fdopen (child_stderr_array[fileno (child_process)], "r");
  	if (child_stderr == NULL)
! 		printf (_("Could not open stderr for %s\n"), WHO_COMMAND);
  
  	users = 0;
***************
*** 86,90 ****
  
  		/* get total logged in users */
! 		if (sscanf (input_buffer, "# users=%d", &users) == 1)
  			break;
  
--- 99,103 ----
  
  		/* get total logged in users */
! 		if (sscanf (input_buffer, _("# users=%d"), &users) == 1)
  			break;
  
***************
*** 109,115 ****
  
  	if (result == STATE_UNKNOWN)
! 		printf ("Unable to read output\n");
  	else
! 		printf ("USERS %s - %d users currently logged in\n", state_text (result),
  						users);
  
--- 122,128 ----
  
  	if (result == STATE_UNKNOWN)
! 		printf (_("Unable to read output\n"));
  	else
! 		printf (_("USERS %s - %d users currently logged in\n"), state_text (result),
  						users);
  
***************
*** 147,151 ****
  		switch (c) {
  		case '?':									/* print short usage statement if args not parsable */
! 			printf ("%s: Unknown argument: %s\n\n", progname, optarg);
  			print_usage ();
  			exit (STATE_UNKNOWN);
--- 160,164 ----
  		switch (c) {
  		case '?':									/* print short usage statement if args not parsable */
! 			printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
  			print_usage ();
  			exit (STATE_UNKNOWN);
***************
*** 158,167 ****
  		case 'c':									/* critical */
  			if (!is_intnonneg (optarg))
! 				usage ("Critical threshold must be a nonnegative integer\n");
  			cusers = atoi (optarg);
  			break;
  		case 'w':									/* warning */
  			if (!is_intnonneg (optarg))
! 				usage ("Warning threshold must be a nonnegative integer\n");
  			wusers = atoi (optarg);
  			break;
--- 171,180 ----
  		case 'c':									/* critical */
  			if (!is_intnonneg (optarg))
! 				usage (_("Critical threshold must be a nonnegative integer\n"));
  			cusers = atoi (optarg);
  			break;
  		case 'w':									/* warning */
  			if (!is_intnonneg (optarg))
! 				usage (_("Warning threshold must be a nonnegative integer\n"));
  			wusers = atoi (optarg);
  			break;
***************
*** 172,176 ****
  	if (wusers == -1 && argc > c) {
  		if (is_intnonneg (argv[c]) == FALSE)
! 			usage ("Warning threshold must be a nonnegative integer\n");
  		wusers = atoi (argv[c++]);
  	}
--- 185,189 ----
  	if (wusers == -1 && argc > c) {
  		if (is_intnonneg (argv[c]) == FALSE)
! 			usage (_("Warning threshold must be a nonnegative integer\n"));
  		wusers = atoi (argv[c++]);
  	}
***************
*** 178,214 ****
  	if (cusers == -1 && argc > c) {
  		if (is_intnonneg (argv[c]) == FALSE)
! 			usage ("Warning threshold must be a nonnegative integer\n");
  		cusers = atoi (argv[c]);
  	}
  
  	return OK;
- }
- 
- 
- 
- 
- 
- void
- print_help (void)
- {
- 	print_revision (progname, revision);
- 	printf ("Copyright (c) %s %s\n\t<%s>\n\n", copyright, authors, email);
- 	printf (summary);
- 	print_usage ();
- 	printf ("\nOptions:\n");
- 	printf (options);
- 	printf (standard_options);
- 	support ();
- }
- 
- 
- 
- 
- 
- void
- print_usage (void)
- {
- 	printf ("Usage: %s %s\n", progname, option_summary);
- 	printf ("       %s (-h|--help)\n", progname);
- 	printf ("       %s (-V|--version)\n", progname);
  }
--- 191,198 ----
  	if (cusers == -1 && argc > c) {
  		if (is_intnonneg (argv[c]) == FALSE)
! 			usage (_("Warning threshold must be a nonnegative integer\n"));
  		cusers = atoi (argv[c]);
  	}
  
  	return OK;
  }

Index: urlize.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/urlize.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** urlize.c	10 Jun 2003 05:02:44 -0000	1.6
--- urlize.c	4 Aug 2003 11:38:27 -0000	1.7
***************
*** 39,42 ****
--- 39,45 ----
  
  const char *progname = "urlize";
+ const char *revision = "$Revision$";
+ const char *copyright = "2000-2003";
+ const char *email = "nagiosplug-devel at lists.sourceforge.net";
  
  #include "common.h"
***************
*** 44,50 ****
  #include "popen.h"
  
! void print_usage (const char *);
! void print_help (const char *);
  
  int
  main (int argc, char **argv)
--- 47,88 ----
  #include "popen.h"
  
! void
! print_usage (void)
! {
! 	printf (_("Usage:\n %s <url> <plugin> <arg1> ... <argN>\n"), progname);
! }
! 
! void
! print_help (void)
! {
! 	print_revision (progname, revision);
  
+ 	printf (_("Copyright (c) 2000 Karl DeBisschop <kdebisschop at users.sourceforge.net>\n"));
+ 	printf (_(COPYRIGHT), copyright, email);
+ 
+ 	printf (_("\n\
+ This plugin wraps the text output of another command (plugin) in HTML\n\
+ <A> tags, thus displaying the plugin output in as a clickable link in\n\
+ the Nagios status screen.  The return status is the same as the invoked\n\
+ plugin.\n\n"));
+ 
+ 	print_usage ();
+ 
+ 	printf (_("\n\
+ Pay close attention to quoting to ensure that the shell passes the expected\n\
+ data to the plugin. For example, in:\n\
+ \n\
+     urlize http://example.com/ check_http -H example.com -r 'two words'\n\
+ \n\
+ the shell will remove the single quotes and urlize will see:\n\
+ \n\
+     urlize http://example.com/ check_http -H example.com -r two words\n\
+ \n\
+ You probably want:\n\
+ \n\
+     urlize http://example.com/ \"check_http -H example.com -r 'two words'\"\n"));
+ 	exit (STATE_OK);
+ }
+ 
  int
  main (int argc, char **argv)
***************
*** 55,74 ****
  
  	if (argc < 2) {
! 		print_usage (progname);
  		exit (STATE_UNKNOWN);
  	}
  
  	if (!strcmp (argv[1], "-h") || !strcmp (argv[1], "--help")) {
! 		print_help (argv[0]);
  		exit (STATE_OK);
  	}
  
  	if (!strcmp (argv[1], "-V") || !strcmp (argv[1], "--version")) {
! 		print_revision (progname, "$Revision$");
  		exit (STATE_OK);
  	}
  
  	if (argc < 2) {
! 		print_usage (progname);
  		exit (STATE_UNKNOWN);
  	}
--- 93,112 ----
  
  	if (argc < 2) {
! 		print_usage ();
  		exit (STATE_UNKNOWN);
  	}
  
  	if (!strcmp (argv[1], "-h") || !strcmp (argv[1], "--help")) {
! 		print_help ();
  		exit (STATE_OK);
  	}
  
  	if (!strcmp (argv[1], "-V") || !strcmp (argv[1], "--version")) {
! 		print_revision (progname, revision);
  		exit (STATE_OK);
  	}
  
  	if (argc < 2) {
! 		print_usage ();
  		exit (STATE_UNKNOWN);
  	}
***************
*** 81,85 ****
  	child_process = spopen (cmd);
  	if (child_process == NULL) {
! 		printf ("Could not open pipe: %s\n", cmd);
  		exit (STATE_UNKNOWN);
  	}
--- 119,123 ----
  	child_process = spopen (cmd);
  	if (child_process == NULL) {
! 		printf (_("Could not open pipe: %s\n"), cmd);
  		exit (STATE_UNKNOWN);
  	}
***************
*** 87,91 ****
  	child_stderr = fdopen (child_stderr_array[fileno (child_process)], "r");
  	if (child_stderr == NULL) {
! 		printf ("Could not open stderr for %s\n", cmd);
  	}
  
--- 125,129 ----
  	child_stderr = fdopen (child_stderr_array[fileno (child_process)], "r");
  	if (child_stderr == NULL) {
! 		printf (_("Could not open stderr for %s\n"), cmd);
  	}
  
***************
*** 103,107 ****
  
  	if (!found) {
! 		printf ("%s problem - No data recieved from host\nCMD: %s</A>\n", argv[0],
  						cmd);
  		exit (STATE_UNKNOWN);
--- 141,145 ----
  
  	if (!found) {
! 		printf (_("%s problem - No data recieved from host\nCMD: %s</A>\n"), argv[0],
  						cmd);
  		exit (STATE_UNKNOWN);
***************
*** 120,155 ****
  	printf ("</A>\n");
  	return result;
- }
- 
- void
- print_usage (const char *cmd)
- {
- 	printf ("Usage:\n %s <url> <plugin> <arg1> ... <argN>\n",	cmd);
- }
- 
- void
- print_help (const char *cmd)
- {
- 	print_revision (progname, "$Revision$");
- 	printf ("\
- Copyright (c) 2000 Karl DeBisschop (kdebiss at alum.mit.edu)\n\n\
- \nThis plugin wraps the text output of another command (plugin) in HTML\n\
- <A> tags, thus displaying the plugin output in as a clickable link in\n\
- the Nagios status screen.  The return status is the same as the invoked\n\
- plugin.\n\n");
- 	print_usage (cmd);
- 	printf ("\n\
- Pay close attention to quoting to ensure that the shell passes the expected\n\
- data to the plugin. For example, in:\n\
- \n\
-     urlize http://example.com/ check_http -H example.com -r 'two words'\n\
- \n\
- the shell will remove the single quotes and urlize will see:\n\
- \n\
-     urlize http://example.com/ check_http -H example.com -r two words\n\
- \n\
- You probably want:\n\
- \n\
-     urlize http://example.com/ \"check_http -H example.com -r 'two words'\"\n");
- 	exit (STATE_OK);
  }
--- 158,160 ----