start of the cleaning of the localization

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

1 files changed, 232 insertions, 221 deletions

diff --git a/plugins/check_game.c b/plugins/check_game.c
index 8548bbdb..9f9ff7d8 100644
--- a/plugins/check_game.c
+++ b/plugins/check_game.c
@@ -19,7 +19,7 @@
 
 const char *progname = "check_game";
 const char *revision = "$Revision$";
-const char *copyright = "2002-2004";
+const char *copyright = "2002-2005";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
 #include "common.h"
@@ -31,12 +31,12 @@ int validate_arguments (void);
 void print_help (void);
 void print_usage (void);
 
-#define QSTAT_DATA_DELIMITER 	","
+#define QSTAT_DATA_DELIMITER  ","
 
-#define QSTAT_HOST_ERROR	"ERROR"
-#define QSTAT_HOST_DOWN		"DOWN"
-#define QSTAT_HOST_TIMEOUT	"TIMEOUT"
-#define QSTAT_MAX_RETURN_ARGS	12
+#define QSTAT_HOST_ERROR  "ERROR"
+#define QSTAT_HOST_DOWN   "DOWN"
+#define QSTAT_HOST_TIMEOUT  "TIMEOUT"
+#define QSTAT_MAX_RETURN_ARGS 12
 
 char *server_ip;
 char *game_type;
@@ -54,239 +54,241 @@ int qstat_ping_field = -1;
 int
 main (int argc, char **argv)
 {
-	char *command_line;
-	int result = STATE_UNKNOWN;
-	char *p, *ret[QSTAT_MAX_RETURN_ARGS];
-	size_t i = 0;
-	output chld_out;
-
-	setlocale (LC_ALL, "");
-	bindtextdomain (PACKAGE, LOCALEDIR);
-	textdomain (PACKAGE);
-	
-	if (process_arguments (argc, argv) == ERROR)
-		usage_va(_("Could not parse arguments"));
-
-	result = STATE_OK;
-
-	/* create the command line to execute */
-	asprintf (&command_line, "%s -raw %s -%s %s",
-						PATH_TO_QSTAT, QSTAT_DATA_DELIMITER, game_type, server_ip);
-	
-	if (port)
-		asprintf (&command_line, "%s:%-d", command_line, port);
-
-	if (verbose > 0)
-		printf ("%s\n", command_line);
-
-	/* run the command. historically, this plugin ignores output on stderr,
-	 * as well as return status of the qstat program */
-	(void)np_runcmd(command_line, &chld_out, NULL, 0);
-
-	/* sanity check */
-	/* was thinking about running qstat without any options, capturing the
-	   -default line, parsing it & making an array of all know server types
-	   but thought this would be too much hassle considering this is a tool
-	   for intelligent sysadmins (ha). Could put a static array of known 
-	   server types in a header file but then we'd be limiting ourselves
-
-	   In the end, I figured I'd simply let an error occur & then trap it
-	 */
-
-	if (!strncmp (chld_out.line[0], "unknown option", 14)) {
-		printf (_("CRITICAL - Host type parameter incorrect!\n"));
-		result = STATE_CRITICAL;
-		return result;
-	}
-
-	p = (char *) strtok (chld_out.line[0], QSTAT_DATA_DELIMITER);
-	while (p != NULL) {
-		ret[i] = p;
-		p = (char *) strtok (NULL, QSTAT_DATA_DELIMITER);
-		i++;
-		if (i >= QSTAT_MAX_RETURN_ARGS)
-			break;
-	}
-
-	if (strstr (ret[2], QSTAT_HOST_ERROR)) {
-		printf (_("CRITICAL - Host not found\n"));
-		result = STATE_CRITICAL;
-	}
-	else if (strstr (ret[2], QSTAT_HOST_DOWN)) {
-		printf (_("CRITICAL - Game server down or unavailable\n"));
-		result = STATE_CRITICAL;
-	}
-	else if (strstr (ret[2], QSTAT_HOST_TIMEOUT)) {
-		printf (_("CRITICAL - Game server timeout\n"));
-		result = STATE_CRITICAL;
-	}
-	else {
-		printf ("OK: %s/%s %s (%s), Ping: %s ms|%s %s\n", 
-		        ret[qstat_game_players],
-		        ret[qstat_game_players_max],
-		        ret[qstat_game_field], 
-		        ret[qstat_map_field],
-		        ret[qstat_ping_field],
-		        perfdata ("players", atol(ret[qstat_game_players]), "",
-		                  FALSE, 0, FALSE, 0,
-		                  TRUE, 0, TRUE, atol(ret[qstat_game_players_max])),
-		        fperfdata ("ping", strtod(ret[qstat_ping_field], NULL), "",
-		                  FALSE, 0, FALSE, 0,
-		                  TRUE, 0, FALSE, 0));
-	}
-
-	return result;
+  char *command_line;
+  int result = STATE_UNKNOWN;
+  char *p, *ret[QSTAT_MAX_RETURN_ARGS];
+  size_t i = 0;
+  output chld_out;
+
+  setlocale (LC_ALL, "");
+  bindtextdomain (PACKAGE, LOCALEDIR);
+  textdomain (PACKAGE);
+  
+  if (process_arguments (argc, argv) == ERROR)
+    usage_va(_("Could not parse arguments"));
+
+  result = STATE_OK;
+
+  /* create the command line to execute */
+  asprintf (&command_line, "%s -raw %s -%s %s",
+            PATH_TO_QSTAT, QSTAT_DATA_DELIMITER, game_type, server_ip);
+  
+  if (port)
+    asprintf (&command_line, "%s:%-d", command_line, port);
+
+  if (verbose > 0)
+    printf ("%s\n", command_line);
+
+  /* run the command. historically, this plugin ignores output on stderr,
+   * as well as return status of the qstat program */
+  (void)np_runcmd(command_line, &chld_out, NULL, 0);
+
+  /* sanity check */
+  /* was thinking about running qstat without any options, capturing the
+     -default line, parsing it & making an array of all know server types
+     but thought this would be too much hassle considering this is a tool
+     for intelligent sysadmins (ha). Could put a static array of known 
+     server types in a header file but then we'd be limiting ourselves
+
+     In the end, I figured I'd simply let an error occur & then trap it
+   */
+
+  if (!strncmp (chld_out.line[0], "unknown option", 14)) {
+    printf (_("CRITICAL - Host type parameter incorrect!\n"));
+    result = STATE_CRITICAL;
+    return result;
+  }
+
+  p = (char *) strtok (chld_out.line[0], QSTAT_DATA_DELIMITER);
+  while (p != NULL) {
+    ret[i] = p;
+    p = (char *) strtok (NULL, QSTAT_DATA_DELIMITER);
+    i++;
+    if (i >= QSTAT_MAX_RETURN_ARGS)
+      break;
+  }
+
+  if (strstr (ret[2], QSTAT_HOST_ERROR)) {
+    printf (_("CRITICAL - Host not found\n"));
+    result = STATE_CRITICAL;
+  }
+  else if (strstr (ret[2], QSTAT_HOST_DOWN)) {
+    printf (_("CRITICAL - Game server down or unavailable\n"));
+    result = STATE_CRITICAL;
+  }
+  else if (strstr (ret[2], QSTAT_HOST_TIMEOUT)) {
+    printf (_("CRITICAL - Game server timeout\n"));
+    result = STATE_CRITICAL;
+  }
+  else {
+    printf ("OK: %s/%s %s (%s), Ping: %s ms|%s %s\n", 
+            ret[qstat_game_players],
+            ret[qstat_game_players_max],
+            ret[qstat_game_field], 
+            ret[qstat_map_field],
+            ret[qstat_ping_field],
+            perfdata ("players", atol(ret[qstat_game_players]), "",
+                      FALSE, 0, FALSE, 0,
+                      TRUE, 0, TRUE, atol(ret[qstat_game_players_max])),
+            fperfdata ("ping", strtod(ret[qstat_ping_field], NULL), "",
+                      FALSE, 0, FALSE, 0,
+                      TRUE, 0, FALSE, 0));
+  }
+
+  return result;
 }
 
 
 int
 process_arguments (int argc, char **argv)
 {
-	int c;
-
-	int opt_index = 0;
-	static struct option long_opts[] = {
-		{"help", no_argument, 0, 'h'},
-		{"version", no_argument, 0, 'V'},
-		{"verbose", no_argument, 0, 'v'},
-		{"timeout", required_argument, 0, 't'},
-		{"hostname", required_argument, 0, 'H'},
-		{"port", required_argument, 0, 'P'},
-		{"game-type", required_argument, 0, 'G'},
-		{"map-field", required_argument, 0, 'm'},
-		{"ping-field", required_argument, 0, 'p'},
-		{"game-field", required_argument, 0, 'g'},
-		{"players-field", required_argument, 0, 129},
-		{"max-players-field", required_argument, 0, 130},
-		{0, 0, 0, 0}
-	};
-
-	if (argc < 2)
-		return ERROR;
-
-	for (c = 1; c < argc; c++) {
-		if (strcmp ("-mf", argv[c]) == 0)
-			strcpy (argv[c], "-m");
-		else if (strcmp ("-pf", argv[c]) == 0)
-			strcpy (argv[c], "-p");
-		else if (strcmp ("-gf", argv[c]) == 0)
-			strcpy (argv[c], "-g");
-	}
-
-	while (1) {
-		c = getopt_long (argc, argv, "hVvt:H:P:G:g:p:m:", long_opts, &opt_index);
-
-		if (c == -1 || c == EOF)
-			break;
-
-		switch (c) {
-		case 'h': /* help */
-			print_help ();
-			exit (STATE_OK);
-		case 'V': /* version */
-			print_revision (progname, revision);
-			exit (STATE_OK);
-		case 'v': /* version */
-			verbose = TRUE;
-			break;
-		case 't': /* timeout period */
-			timeout_interval = atoi (optarg);
-			break;
-		case 'H': /* hostname */
-			if (strlen (optarg) >= MAX_HOST_ADDRESS_LENGTH)
-				die (STATE_UNKNOWN, _("Input buffer overflow\n"));
-			server_ip = optarg;
-			break;
-		case 'P': /* port */
-			port = atoi (optarg);
-			break;
-		case 'G': /* hostname */
-			if (strlen (optarg) >= MAX_INPUT_BUFFER)
-				die (STATE_UNKNOWN, _("Input buffer overflow\n"));
-			game_type = optarg;
-			break;
-		case 'p': /* index of ping field */
-			qstat_ping_field = atoi (optarg);
-			if (qstat_ping_field < 0 || qstat_ping_field > QSTAT_MAX_RETURN_ARGS)
-				return ERROR;
-			break;
-		case 'm': /* index on map field */
-			qstat_map_field = atoi (optarg);
-			if (qstat_map_field < 0 || qstat_map_field > QSTAT_MAX_RETURN_ARGS)
-				return ERROR;
-			break;
-		case 'g': /* index of game field */
-			qstat_game_field = atoi (optarg);
-			if (qstat_game_field < 0 || qstat_game_field > QSTAT_MAX_RETURN_ARGS)
-				return ERROR;
-			break;
-		case 129: /* index of player count field */
-			qstat_game_players = atoi (optarg);
-			if (qstat_game_players_max == 0)
-				qstat_game_players_max = qstat_game_players - 1;
-			if (qstat_game_players < 0 || qstat_game_players > QSTAT_MAX_RETURN_ARGS)
-				return ERROR;
-			break;
-		case 130: /* index of max players field */
-			qstat_game_players_max = atoi (optarg);
-			if (qstat_game_players_max < 0 || qstat_game_players_max > QSTAT_MAX_RETURN_ARGS)
-				return ERROR;
-			break;
-		default: /* args not parsable */
-			usage_va(_("Unknown argument - %s"), optarg);
-		}
-	}
-
-	c = optind;
-	/* first option is the game type */
-	if (!game_type && c<argc)
-		game_type = strdup (argv[c++]);
-
-	/* Second option is the server name */
-	if (!server_ip && c<argc)
-		server_ip = strdup (argv[c++]);
-
-	return validate_arguments ();
+  int c;
+
+  int opt_index = 0;
+  static struct option long_opts[] = {
+    {"help", no_argument, 0, 'h'},
+    {"version", no_argument, 0, 'V'},
+    {"verbose", no_argument, 0, 'v'},
+    {"timeout", required_argument, 0, 't'},
+    {"hostname", required_argument, 0, 'H'},
+    {"port", required_argument, 0, 'P'},
+    {"game-type", required_argument, 0, 'G'},
+    {"map-field", required_argument, 0, 'm'},
+    {"ping-field", required_argument, 0, 'p'},
+    {"game-field", required_argument, 0, 'g'},
+    {"players-field", required_argument, 0, 129},
+    {"max-players-field", required_argument, 0, 130},
+    {0, 0, 0, 0}
+  };
+
+  if (argc < 2)
+    return ERROR;
+
+  for (c = 1; c < argc; c++) {
+    if (strcmp ("-mf", argv[c]) == 0)
+      strcpy (argv[c], "-m");
+    else if (strcmp ("-pf", argv[c]) == 0)
+      strcpy (argv[c], "-p");
+    else if (strcmp ("-gf", argv[c]) == 0)
+      strcpy (argv[c], "-g");
+  }
+
+  while (1) {
+    c = getopt_long (argc, argv, "hVvt:H:P:G:g:p:m:", long_opts, &opt_index);
+
+    if (c == -1 || c == EOF)
+      break;
+
+    switch (c) {
+    case 'h': /* help */
+      print_help ();
+      exit (STATE_OK);
+    case 'V': /* version */
+      print_revision (progname, revision);
+      exit (STATE_OK);
+    case 'v': /* version */
+      verbose = TRUE;
+      break;
+    case 't': /* timeout period */
+      timeout_interval = atoi (optarg);
+      break;
+    case 'H': /* hostname */
+      if (strlen (optarg) >= MAX_HOST_ADDRESS_LENGTH)
+        die (STATE_UNKNOWN, _("Input buffer overflow\n"));
+      server_ip = optarg;
+      break;
+    case 'P': /* port */
+      port = atoi (optarg);
+      break;
+    case 'G': /* hostname */
+      if (strlen (optarg) >= MAX_INPUT_BUFFER)
+        die (STATE_UNKNOWN, _("Input buffer overflow\n"));
+      game_type = optarg;
+      break;
+    case 'p': /* index of ping field */
+      qstat_ping_field = atoi (optarg);
+      if (qstat_ping_field < 0 || qstat_ping_field > QSTAT_MAX_RETURN_ARGS)
+        return ERROR;
+      break;
+    case 'm': /* index on map field */
+      qstat_map_field = atoi (optarg);
+      if (qstat_map_field < 0 || qstat_map_field > QSTAT_MAX_RETURN_ARGS)
+        return ERROR;
+      break;
+    case 'g': /* index of game field */
+      qstat_game_field = atoi (optarg);
+      if (qstat_game_field < 0 || qstat_game_field > QSTAT_MAX_RETURN_ARGS)
+        return ERROR;
+      break;
+    case 129: /* index of player count field */
+      qstat_game_players = atoi (optarg);
+      if (qstat_game_players_max == 0)
+        qstat_game_players_max = qstat_game_players - 1;
+      if (qstat_game_players < 0 || qstat_game_players > QSTAT_MAX_RETURN_ARGS)
+        return ERROR;
+      break;
+    case 130: /* index of max players field */
+      qstat_game_players_max = atoi (optarg);
+      if (qstat_game_players_max < 0 || qstat_game_players_max > QSTAT_MAX_RETURN_ARGS)
+        return ERROR;
+      break;
+    default: /* args not parsable */
+      usage_va(_("Unknown argument - %s"), optarg);
+    }
+  }
+
+  c = optind;
+  /* first option is the game type */
+  if (!game_type && c<argc)
+    game_type = strdup (argv[c++]);
+
+  /* Second option is the server name */
+  if (!server_ip && c<argc)
+    server_ip = strdup (argv[c++]);
+
+  return validate_arguments ();
 }
 
 
 int
 validate_arguments (void)
 {
-	if (qstat_game_players_max < 0)
-		qstat_game_players_max = 4;
+  if (qstat_game_players_max < 0)
+    qstat_game_players_max = 4;
 
-	if (qstat_game_players < 0)
-		qstat_game_players = 5;
+  if (qstat_game_players < 0)
+    qstat_game_players = 5;
 
-	if (qstat_game_field < 0)
-		qstat_game_field = 2;
+  if (qstat_game_field < 0)
+    qstat_game_field = 2;
 
-	if (qstat_map_field < 0)
-		qstat_map_field = 3;
+  if (qstat_map_field < 0)
+    qstat_map_field = 3;
 
-	if (qstat_ping_field < 0)
-		qstat_ping_field = 5;
+  if (qstat_ping_field < 0)
+    qstat_ping_field = 5;
 
-	return OK;
+  return OK;
 }
 
 
 void
 print_help (void)
 {
-	print_revision (progname, revision);
+  print_revision (progname, revision);
 
-	printf ("Copyright (c) 1999 Ian Cass, Knowledge Matters Limited\n");
-	printf (COPYRIGHT, copyright, email);
+  printf ("Copyright (c) 1999 Ian Cass, Knowledge Matters Limited\n");
+  printf (COPYRIGHT, copyright, email);
 
-	printf (_("This plugin tests game server connections with the specified host."));
+  printf (_("This plugin tests game server connections with the specified host."));
 
-	print_usage ();
+ printf ("\n\n");
+ 
+  print_usage ();
 
-	printf (_(UT_HELP_VRSN));
+  printf (_(UT_HELP_VRSN));
 
-	printf (_("\
+  printf (_("\
 <game>        = Game type that is recognised by qstat (without the leading dash)\n\
 <ip_address>  = The IP address of the device you wish to query\n\
  [port]        = Optional port of which to connect\n\
@@ -294,15 +296,25 @@ print_help (void)
  [map_field]   = Field number in raw qstat output that contains map name\n\
  [ping_field]  = Field number in raw qstat output that contains ping time\n"));
 
-	printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
+  printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
 
-	printf (_("\n\
-Notes:\n\
-- This plugin uses the 'qstat' command, the popular game server status query tool .\n\
-  If you don't have the package installed, you will need to download it from\n\
-  http://www.activesw.com/people/steve/qstat.html before you can use this plugin.\n"));
+  printf (_("Notes:"));
+  
+  printf ("\n");
 
-	printf (_(UT_SUPPORT));
+  printf (_("This plugin uses the 'qstat' command, the popular game server status query tool ."));
+  
+  printf ("\n");
+
+  printf (_("If you don't have the package installed, you will need to download it from"));
+  
+  printf ("\n");
+
+  printf (_("http://www.activesw.com/people/steve/qstat.html before you can use this plugin."));
+
+  printf ("\n");
+
+  printf (_(UT_SUPPORT));
 }
 
 
@@ -310,9 +322,8 @@ Notes:\n\
 void
 print_usage (void)
 {
-	printf ("\
-Usage: %s <game> <ip_address> [-p port] [-gf game_field] [-mf map_field]\n\
-                  [-pf ping_field]\n", progname);
+  printf (_("Usage:"));
+  printf (" %s <game> <ip_address> [-p port] [-gf game_field] [-mf map_field] [-pf ping_field]\n", progname);
 }
 
 /******************************************************************************