3 files changed, 180 insertions, 223 deletions

diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c
index ee0b8d66..f6e0fca0 100644
--- a/plugins/check_ldap.c
+++ b/plugins/check_ldap.c
@@ -1,19 +1,19 @@
 /******************************************************************************
-*
-* 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.
-*
+
+ 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_ldap";
@@ -21,7 +21,6 @@ const char *revision = "$Revision$";
 const char *copyright = "2000-2003";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
-#include "config.h"
 #include "common.h"
 #include "netutils.h"
 #include "utils.h"
diff --git a/plugins/check_mrtg.c b/plugins/check_mrtg.c
index 095dcbc8..88c8e490 100644
--- a/plugins/check_mrtg.c
+++ b/plugins/check_mrtg.c
@@ -1,43 +1,57 @@
 /******************************************************************************
- *
- * Program: MRTG (Multi-Router Traffic Grapher) generic plugin for Nagios
- * License: GPL
- *
- * License Information:
- *
- * 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.
- *
- * $Id$
- *
- *****************************************************************************/
+
+ 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_mrtg";
-#define REVISION "$Revision$"
-#define COPYRIGHT "Copyright (c) 1999-2001 Ethan Galstad"
+const char *revision =  "$Revision$";
+const char *copyright = "1999-2001";
+const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
-#define SUMMARY "\
-This plugin will check either the average or maximum value of one of the\n\
-two variables recorded in an MRTG log file.\n"
+#include "common.h"
+#include "utils.h"
 
-/* old command line: 
+/* original command line: 
          <log_file> <expire_minutes> <AVG|MAX> <variable> <vwl> <vcl> <label> [units] */
-#define OPTIONS "\
--F log_file -a <AVG | MAX> -v variable -w warning -c critical\n\
-            [-l label] [-u units] [-e expire_minutes] [-t timeout] [-v]"
 
-#define LONGOPTIONS "\
+void
+print_usage (void)
+{
+        printf (_("\
+Usage: %s -F log_file -a <AVG | MAX> -v variable -w warning -c critical\n\
+  [-l label] [-u units] [-e expire_minutes] [-t timeout] [-v]\n"), progname);
+        printf (_(UT_HLP_VRS), progname, progname);
+}
+
+void
+print_help (void)
+{
+        print_revision (progname, revision);
+
+        printf (_(COPYRIGHT), copyright, email);
+
+        printf(_("\
+This plugin will check either the average or maximum value of one of the\n\
+two variables recorded in an MRTG log file.\n"));
+
+        print_usage ();
+
+        printf (_(UT_HELP_VRSN));
+
+        printf (_("\
  -F, --logfile=FILE\n\
    The MRTG log file containing the data you want to monitor\n\
  -e, --expires=MINUTES\n\
@@ -45,50 +59,45 @@ two variables recorded in an MRTG log file.\n"
  -a, --aggregation=AVG|MAX\n\
    Should we check average or maximum values?\n\
  -v, --variable=INTEGER\n\
-   Which variable set should we inspect? 1 or 2?\n\
+   Which variable set should we inspect? (1 or 2)\n\
  -w, --warning=INTEGER\n\
    Threshold value for data to result in WARNING status\n\
  -c, --critical=INTEGER\n\
-   Threshold value for data to result in CRITICAL status\n\
+   Threshold value for data to result in CRITICAL status\n"));
+
+        printf (_("\
  -l, --label=STRING\n\
    Type label for data (Examples: Conns, \"Processor Load\", In, Out)\n\
  -u, --units=STRING\n\
    Option units label for data (Example: Packets/Sec, Errors/Sec, \n\
-   \"Bytes Per Second\", \"%% Utilization\")\n\
- -h, --help\n\
-   Print detailed help screen\n\
- -V, --version\n\
-   Print version information\n"
+   \"Bytes Per Second\", \"%% Utilization\")\n"));
 
-#define DESCRIPTION "\
+        printf (_("\
 If the value exceeds the <vwl> threshold, a WARNING status is returned.  If\n\
 the value exceeds the <vcl> threshold, a CRITICAL status is returned.  If\n\
 the data in the log file is older than <expire_minutes> old, a WARNING\n\
-status is returned and a warning message is printed.\n\
-\n\
-This plugin is useful for monitoring MRTG data that does not correspond to\n\
+status is returned and a warning message is printed.\n\n"));
+
+        printf(_("This plugin is useful for monitoring MRTG data that does not correspond to\n\
 bandwidth usage.  (Use the check_mrtgtraf plugin for monitoring bandwidth).\n\
 It can be used to monitor any kind of data that MRTG is monitoring - errors,\n\
 packets/sec, etc.  I use MRTG in conjuction with the Novell NLM that allows\n\
 me to track processor utilization, user connections, drive space, etc and\n\
-this plugin works well for monitoring that kind of data as well.\n\
-\n\
-Notes:\n\
+this plugin works well for monitoring that kind of data as well.\n\n"));
+
+        printf (_("Notes:\n\
 - This plugin only monitors one of the two variables stored in the MRTG log\n\
   file.  If you want to monitor both values you will have to define two\n\
   commands with different values for the <variable> argument.  Of course,\n\
   you can always hack the code to make this plugin work for you...\n\
 - MRTG stands for the Multi Router Traffic Grapher.  It can be downloaded from\n\
-  http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/mrtg.html\n"
+  http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/mrtg.html\n"));
 
-#include "config.h"
-#include "common.h"
-#include "utils.h"
+        printf (_(UT_SUPPORT));
+}
 
 int process_arguments (int, char **);
 int validate_arguments (void);
-void print_help (void);
-void print_usage (void);
 
 char *log_file = NULL;
 int expire_minutes = 0;
@@ -115,12 +124,12 @@ main (int argc, char **argv)
         unsigned long value_rate = 0L;
 
         if (process_arguments (argc, argv) != OK)
-                usage ("Invalid command arguments supplied\n");
+                usage (_("Invalid command arguments supplied\n"));
 
         /* open the MRTG log file for reading */
         fp = fopen (log_file, "r");
         if (fp == NULL) {
-                printf ("Unable to open MRTG log file\n");
+                printf (_("Unable to open MRTG log file\n"));
                 return STATE_UNKNOWN;
         }
 
@@ -168,7 +177,7 @@ main (int argc, char **argv)
         /* if we couldn't read enough data, return an unknown error */
         if (line <= 2) {
                 result = STATE_UNKNOWN;
-                sprintf (error_message, "Unable to process MRTG log file\n");
+                sprintf (error_message, _("Unable to process MRTG log file\n"));
         }
 
         /* make sure the MRTG data isn't too old */
@@ -177,7 +186,7 @@ main (int argc, char **argv)
                 if (expire_minutes > 0
                                 && (current_time - timestamp) > (expire_minutes * 60)) {
                         result = STATE_WARNING;
-                        sprintf (error_message, "MRTG data has expired (%d minutes old)\n",
+                        sprintf (error_message, _("MRTG data has expired (%d minutes old)\n"),
                                                          (int) ((current_time - timestamp) / 60));
                 }
         }
@@ -197,17 +206,13 @@ main (int argc, char **argv)
         }
 
         sprintf (error_message, "%s. %s = %lu %s",
-                                         (use_average == TRUE) ? "Ave" : "Max", value_label, value_rate,
+                                         (use_average == TRUE) ? _("Ave") : _("Max"), value_label, value_rate,
                                          units_label);
         printf ("%s\n", error_message);
 
         return result;
 }
-
-
-
-
-
+
 /* process command-line arguments */
 int
 process_arguments (int argc, char **argv)
@@ -265,7 +270,7 @@ process_arguments (int argc, char **argv)
                 case 'v':
                         variable_number = atoi (optarg);
                         if (variable_number < 1 || variable_number > 2)
-                                usage ("Invalid variable number\n");
+                                usage (_("Invalid variable number\n"));
                         break;
                 case 'w':                                                                       /* critical time threshold */
                         value_warning_threshold = strtoul (optarg, NULL, 10);
@@ -280,13 +285,13 @@ process_arguments (int argc, char **argv)
                         units_label = optarg;
                         break;
                 case 'V':                                                                       /* version */
-                        print_revision (progname, REVISION);
+                        print_revision (progname, revision);
                         exit (STATE_OK);
                 case 'h':                                                                       /* help */
                         print_help ();
                         exit (STATE_OK);
                 case '?':                                                                       /* help */
-                        usage ("Invalid argument\n");
+                        usage (_("Invalid argument\n"));
                 }
         }
 
@@ -300,7 +305,7 @@ process_arguments (int argc, char **argv)
                         expire_minutes = atoi (argv[c++]);
                 else
                         terminate (STATE_UNKNOWN,
-                                   "%s is not a valid expiration time\nUse '%s -h' for additional help\n",
+                                   _("%s is not a valid expiration time\nUse '%s -h' for additional help\n"),
                                    argv[c], progname);
         }
 
@@ -317,7 +322,7 @@ process_arguments (int argc, char **argv)
                 variable_number = atoi (argv[c++]);
                 if (variable_number < 1 || variable_number > 2) {
                         printf ("%s :", argv[c]);
-                        usage ("Invalid variable number\n");
+                        usage (_("Invalid variable number\n"));
                 }
         }
 
@@ -344,26 +349,7 @@ int
 validate_arguments (void)
 {
         if (variable_number == -1)
-                usage ("You must supply the variable number\n");
+                usage (_("You must supply the variable number\n"));
 
         return OK;
 }
-
-void
-print_help (void)
-{
-        print_revision (progname, REVISION);
-        printf ("%s\n\n%s\n", COPYRIGHT, SUMMARY);
-        print_usage ();
-        printf ("\nOptions:\n" LONGOPTIONS "\n" DESCRIPTION "\n");
-        support ();
-}
-
-void
-print_usage (void)
-{
-        printf ("Usage:\n" " %s %s\n"
-                                        " %s (-h | --help) for detailed help\n"
-                                        " %s (-V | --version) for version information\n",
-                                        progname, OPTIONS, progname, progname);
-}
diff --git a/plugins/check_mrtgtraf.c b/plugins/check_mrtgtraf.c
index 21791ae9..c99e4213 100644
--- a/plugins/check_mrtgtraf.c
+++ b/plugins/check_mrtgtraf.c
@@ -1,63 +1,83 @@
 /******************************************************************************
- *
- * CHECK_MRTGTRAF.C
- *
- * Program: MRTG (Multi-Router Traffic Grapher) traffic plugin for Nagios
- * License: GPL
- * Copyright (c) 1999 Ethan Galstad (nagios@nagios.org)
- *
- * Last Modified: $Date$
- *
- * Command line: CHECK_MRTGTRAF <log_file> <expire_minutes> <AVG|MAX> <iwl> <icl> <owl> <ocl>
- *
- * Description:
- *
- * This plugin will check the incoming/outgoing transfer rates of a
- * router, switch, etc recorded in an MRTG log.  If the newest log
- * entry is older than <expire_minutes>, a WARNING status is returned.
- * If either the incoming or outgoing rates exceed the <icl> or <ocl>
- * thresholds (in Bytes/sec), a CRITICAL status results.  If either of
- * the rates exceed the <iwl> or <owl> thresholds (in Bytes/sec), a
- * WARNING status results.
- *
- * Notes:
- * - MRTG stands for the Multi Router Traffic Grapher.  It can be
- *   downloaded from
- *   http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/mrtg.html
- * - While MRTG can monitor things other than traffic rates, this
- *   plugin probably won't work with much else without modification.
- * - The calculated i/o rates are a little off from what MRTG actually
- *   reports.  I'm not sure why this is right now, but will look into it
- *   for future enhancements of this plugin.
- *
- * License Information:
- *
- * 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 "config.h"
+
+ 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 "utils.h"
 
 const char *progname = "check_mrtgtraf";
+const char *revision = "$Revision$";
+const char *copyright = "1999-2003";
+const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
+void
+print_usage (void)
+{
+        printf (_("\
+Usage: %s -F <log_file> -a <AVG | MAX> -v <variable> -w <warning_pair> -c <critical_pair>\n\
+  [-e expire_minutes] [-t timeout] [-v]\n"), progname);
+        printf (_(UT_HLP_VRS), progname, progname);
+}
+
+void
+print_help (void)
+{
+        print_revision (progname, revision);
+
+        printf (_(COPYRIGHT), copyright, email);
+
+        print_usage ();
+
+        printf (_(UT_HELP_VRSN));
+
+        printf (_("\
+ -F, --filename=STRING\n\
+   File to read log from\n\
+ -e, --expires=INTEGER\n\
+   Minutes after which log expires\n\
+ -a, --aggregation=(AVG|MAX)\n\
+   Test average or maximum\n\
+ -w, --warning\n\
+   Warning threshold pair \"<incoming>,<outgoing>\"\n\
+ -c, --critical\n\
+   Critical threshold pair \"<incoming>,<outgoing>\"\n"));
+
+        printf (_("\n\
+This plugin will check the incoming/outgoing transfer rates of a router,\n\
+switch, etc recorded in an MRTG log.  If the newest log entry is older\n\
+than <expire_minutes>, a WARNING status is returned. If either the\n\
+incoming or outgoing rates exceed the <icl> or <ocl> thresholds (in\n\
+Bytes/sec), a CRITICAL status results.  If either of the rates exceed\n\
+the <iwl> or <owl> thresholds (in Bytes/sec), a WARNING status results.\n\n"));
+
+        printf (_("Notes:\n\
+- MRTG stands for Multi Router Traffic Grapher. It can be downloaded from\n\
+  http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/mrtg.html\n\
+- While MRTG can monitor things other than traffic rates, this\n\
+  plugin probably won't work with much else without modification.\n\
+- The calculated i/o rates are a little off from what MRTG actually\n\
+  reports.  I'm not sure why this is right now, but will look into it\n\
+  for future enhancements of this plugin.\n"));
+
+        printf (_(UT_SUPPORT));
+}
+
 int process_arguments (int, char **);
 int validate_arguments (void);
-void print_help (void);
-void print_usage (void);
 
 char *log_file = NULL;
 int expire_minutes = -1;
@@ -90,12 +110,12 @@ main (int argc, char **argv)
         char outgoing_speed_rating[8];
 
         if (process_arguments (argc, argv) != OK)
-                usage ("Invalid command arguments supplied\n");
+                usage (_("Invalid command arguments supplied\n"));
 
         /* open the MRTG log file for reading */
         fp = fopen (log_file, "r");
         if (fp == NULL)
-                usage ("Unable to open MRTG log file\n");
+                usage (_("Unable to open MRTG log file\n"));
 
         line = 0;
         while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, fp)) {
@@ -137,14 +157,14 @@ main (int argc, char **argv)
 
         /* if we couldn't read enough data, return an unknown error */
         if (line <= 2)
-                usage ("Unable to process MRTG log file\n");
+                usage (_("Unable to process MRTG log file\n"));
 
         /* make sure the MRTG data isn't too old */
         time (&current_time);
         if (expire_minutes > 0
                         && (current_time - timestamp) >
                         (expire_minutes * 60)) terminate (STATE_WARNING,
-                                                                                                                                                                "MRTG data has expired (%d minutes old)\n",
+                                                                                                                                                                _("MRTG data has expired (%d minutes old)\n"),
                                                                                                                                                                 (int) ((current_time - timestamp) /
                                                                                                                                                                                          60));
 
@@ -197,34 +217,30 @@ main (int argc, char **argv)
         if (incoming_rate > incoming_critical_threshold
                         || outgoing_rate > outgoing_critical_threshold) {
                 result = STATE_CRITICAL;
-                asprintf (&error_message, "Traffic CRITICAL %s. In = %0.1f %s, %s. Out = %0.1f %s",
-                                                 (use_average == TRUE) ? "Avg" : "Max", adjusted_incoming_rate,
-                                                 incoming_speed_rating, (use_average == TRUE) ? "Avg" : "Max",
-                                                 adjusted_outgoing_rate, outgoing_speed_rating);
+                asprintf (&error_message, _("Traffic CRITICAL %s. In = %0.1f %s, %s. Out = %0.1f %s"),
+                                                        (use_average == TRUE) ? _("Avg") : _("Max"), adjusted_incoming_rate,
+                                                        incoming_speed_rating, (use_average == TRUE) ? "Avg" : "Max",
+                                                        adjusted_outgoing_rate, outgoing_speed_rating);
         }
         else if (incoming_rate > incoming_warning_threshold
                                          || outgoing_rate > outgoing_warning_threshold) {
                 result = STATE_WARNING;
-                asprintf (&error_message, "Traffic WARNING %s. In = %0.1f %s, %s. Out = %0.1f %s",
-                                                 (use_average == TRUE) ? "Avg" : "Max", adjusted_incoming_rate,
-                                                 incoming_speed_rating, (use_average == TRUE) ? "Avg" : "Max",
-                                                 adjusted_outgoing_rate, outgoing_speed_rating);
+                asprintf (&error_message, _("Traffic WARNING %s. In = %0.1f %s, %s. Out = %0.1f %s"),
+                                                        (use_average == TRUE) ? _("Avg") : _("Max"), adjusted_incoming_rate,
+                                                        incoming_speed_rating, (use_average == TRUE) ? _("Avg") : _("Max"),
+                                                        adjusted_outgoing_rate, outgoing_speed_rating);
         }
         else if (result == STATE_OK)
-                printf ("Traffic OK - %s. In = %0.1f %s, %s. Out = %0.1f %s\n",
-                                                (use_average == TRUE) ? "Avg" : "Max", adjusted_incoming_rate,
-                                                incoming_speed_rating, (use_average == TRUE) ? "Avg" : "Max",
+                printf (_("Traffic OK - %s. In = %0.1f %s, %s. Out = %0.1f %s\n"),
+                                                (use_average == TRUE) ? _("Avg") : _("Max"), adjusted_incoming_rate,
+                                                incoming_speed_rating, (use_average == TRUE) ? _("Avg") : _("Max"),
                                                 adjusted_outgoing_rate, outgoing_speed_rating);
         else
-                printf ("UNKNOWN %s\n", error_message);
+                printf (_("UNKNOWN %s\n"), error_message);
 
         return result;
 }
-
-
-
-
-
+
 /* process command-line arguments */
 int
 process_arguments (int argc, char **argv)
@@ -285,13 +301,13 @@ process_arguments (int argc, char **argv)
                                                         &outgoing_warning_threshold);
                         break;
                 case 'V':                                                                       /* version */
-                        print_revision (progname, "$Revision$");
+                        print_revision (progname, revision);
                         exit (STATE_OK);
                 case 'h':                                                                       /* help */
                         print_help ();
                         exit (STATE_OK);
                 case '?':                                                                       /* help */
-                        usage ("Invalid argument\n");
+                        usage (_("Invalid argument\n"));
                 }
         }
 
@@ -341,47 +357,3 @@ validate_arguments (void)
 {
         return OK;
 }
-
-
-
-
-
-void
-print_help (void)
-{
-        print_revision (progname, "$Revision$");
-        printf
-                ("Copyright (c) 2000 Tom Shields/Karl DeBisschop\n\n"
-                 "This plugin tests the UPS service on the specified host.\n\n");
-        print_usage ();
-        printf
-                ("\nOptions:\n"
-                 " -F, --filename=STRING\n"
-                 "   File to read log from\n"
-                 " -e, --expires=INTEGER\n"
-                 "   Minutes after which log expires\n"
-                 " -a, --aggregation=(AVG|MAX)\n"
-                 "   Test average or maximum"
-                 " -w, --warning\n"
-                 "   Warning threshold pair \"<incoming>,<outgoing>\"\n"
-                 " -c, --critical\n"
-                 "   Critical threshold pair \"<incoming>,<outgoing>\"\n"
-                 " -h, --help\n"
-                 "   Print detailed help screen\n"
-                 " -V, --version\n" "   Print version information\n\n");
-        support ();
-}
-
-
-
-
-
-void
-print_usage (void)
-{
-        printf
-                ("Usage: %s  -F <log_file> -a <AVG | MAX> -v <variable> -w <warning_pair> -c <critical_pair>\n"
-                 "            [-e expire_minutes] [-t timeout] [-v]\n"
-                 "       %s --help\n"
-                 "       %s --version\n", progname, progname, progname);
-}