- bindtextdomain for gettext, a few other smale cleanups here and there

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

diff --git a/plugins/check_by_ssh.c b/plugins/check_by_ssh.c
index b0aa1897821ebfcf1e5e706eed80b505b2a7297c..560ae0c61d73298f05bcda96980b11d0c22d5fb9 100644 (file)
--- a/plugins/check_by_ssh.c
+++ b/plugins/check_by_ssh.c
@@ -42,11 +42,6 @@ char **service;
 int passive = FALSE;
 int verbose = FALSE;
 
-
-
-
-
-\f
 int
 main (int argc, char **argv)
 {
@@ -61,8 +56,13 @@ main (int argc, char **argv)
        time_t local_time;
        FILE *fp = NULL;
 
-       asprintf (&remotecmd, "%s", "");
-       asprintf (&comm, "%s", SSH_COMMAND);
+       remotecmd = strdup ("");
+       comm = strdup (SSH_COMMAND);
+       result_text = strdup ("");
+
+       setlocale (LC_ALL, "");
+       bindtextdomain (PACKAGE, LOCALEDIR);
+       textdomain (PACKAGE);
 
        /* process arguments */
        if (process_arguments (argc, argv) == ERROR)
@@ -71,7 +71,7 @@ main (int argc, char **argv)
 
        /* Set signal handling and alarm timeout */
        if (signal (SIGALRM, popen_timeout_alarm_handler) == SIG_ERR) {
-               printf ("Cannot catch SIGALRM");
+               printf (_("Cannot catch SIGALRM"));
                return STATE_UNKNOWN;
        }
        alarm (timeout_interval);
@@ -97,7 +97,7 @@ main (int argc, char **argv)
        }
 
 
-       /* get results from remote command */
+       /* build up results from remote command in result_text */
        while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process))
                asprintf (&result_text, "%s%s", result_text, input_buffer);
 
@@ -105,6 +105,8 @@ main (int argc, char **argv)
        /* WARNING if output found on stderr */
        if (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_stderr)) {
                printf ("%s\n", input_buffer);
+               while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process))
+                       printf ("%s\n", input_buffer);
                return STATE_WARNING;
        }
        (void) fclose (child_stderr);
@@ -122,10 +124,10 @@ main (int argc, char **argv)
                        exit (STATE_UNKNOWN);
                }
 
-               time (&local_time);
+               local_time = time (NULL);
                commands = 0;
                while (result_text && strlen(result_text) > 0) {
-                       status_text = strstr (result_text, _("STATUS CODE: "));
+                       status_text = strstr (result_text, "STATUS CODE: ");
                        if (status_text == NULL) {
                                printf ("%s", result_text);
                                return result;
@@ -136,7 +138,7 @@ main (int argc, char **argv)
                        if (eol != NULL)
                                eol[0] = 0;
                        if (service[commands] && status_text
-                                       && sscanf (status_text, _("STATUS CODE: %d"), &cresult) == 1) {
+                                       && sscanf (status_text, "STATUS CODE: %d", &cresult) == 1) {
                                fprintf (fp, _("[%d] PROCESS_SERVICE_CHECK_RESULT;%s;%s;%d;%s\n"),
                                                                 (int) local_time, host_shortname, service[commands++], cresult,
                                                                 output);
@@ -145,6 +147,7 @@ main (int argc, char **argv)
 
        }
 
+
        /* print the first line from the remote command */
        else {
                eol = strpbrk (result_text, "\r\n");
@@ -153,7 +156,8 @@ main (int argc, char **argv)
                printf ("%s\n", result_text);
        }
 
-       /* return error status from remote command */
+
+       /* return error status from remote command */   
        return result;
 }
 
@@ -222,7 +226,8 @@ process_arguments (int argc, char **argv)
                case 't':                                                                       /* timeout period */
                        if (!is_integer (optarg))
                                usage2 (_("timeout interval must be an integer"), optarg);
-                       timeout_interval = atoi (optarg);
+                       else
+                               timeout_interval = atoi (optarg);
                        break;
                case 'H':                                                                       /* host */
                        if (!is_host (optarg))
@@ -382,6 +387,8 @@ execute additional commands as proxy\n"));
 To use passive mode, provide multiple '-C' options, and provide\n\
 all of -O, -s, and -n options (servicelist order must match '-C'\n\
 options)\n"));
+
+       printf (_(UT_SUPPORT));
 }
 
 

diff --git a/plugins/check_dig.c b/plugins/check_dig.c
index f376e309268a0494629b96b43b9d7b20fa59889e..dc4f89ae529a29043e0a51fc0120a5926ad2525d 100644 (file)
--- a/plugins/check_dig.c
+++ b/plugins/check_dig.c
@@ -42,11 +42,6 @@ int server_port = DEFAULT_PORT;
 int warning_interval = -1;
 int critical_interval = -1;
 
-
-
-
-
-\f
 int
 main (int argc, char **argv)
 {
@@ -57,6 +52,10 @@ main (int argc, char **argv)
 
        output = strdup ("");
 
+       setlocale (LC_ALL, "");
+       bindtextdomain (PACKAGE, LOCALEDIR);
+       textdomain (PACKAGE);
+
        /* Set signal handling and alarm */
        if (signal (SIGALRM, popen_timeout_alarm_handler) == SIG_ERR)
                usage (_("Cannot catch SIGALRM\n"));
@@ -280,6 +279,7 @@ print_help (void)
 
        print_revision (progname, revision);
 
+       printf (_("Copyright (c) 2000 Karl DeBisschop <kdebisschop@users.sourceforge.net>\n"));
        printf (_(COPYRIGHT), copyright, email);
 
        printf (_("Test the DNS service on the specified host using dig\n\n"));

diff --git a/plugins/check_disk.c b/plugins/check_disk.c
index c8cfecd2a4a2cfa73ac46238c9f77b0a597d328c..36f30a591f8ed47e1e67bcac7da638ba641c489f 100644 (file)
--- a/plugins/check_disk.c
+++ b/plugins/check_disk.c
@@ -151,6 +151,10 @@ main (int argc, char **argv)
        output = strdup ("");
        details = strdup ("");
 
+       setlocale (LC_ALL, "");
+       bindtextdomain (PACKAGE, LOCALEDIR);
+       textdomain (PACKAGE);
+
        mount_list = read_filesystem_list (0);
 
        if (process_arguments (argc, argv) != OK)

diff --git a/plugins/check_dns.c b/plugins/check_dns.c
index 58c0a1bf91e88c382e765e7607d52b6fe797f112..328fc5f40a58e60d60000fa3458d560078275b33 100644 (file)
--- a/plugins/check_dns.c
+++ b/plugins/check_dns.c
@@ -82,6 +82,10 @@ main (int argc, char **argv)
        struct timeval tv;
        int multi_address;
 
+       setlocale (LC_ALL, "");
+       bindtextdomain (PACKAGE, LOCALEDIR);
+       textdomain (PACKAGE);
+
        /* Set signal handling and alarm */
        if (signal (SIGALRM, popen_timeout_alarm_handler) == SIG_ERR) {
                printf (_("Cannot catch SIGALRM"));
@@ -398,6 +402,7 @@ print_help (void)
 {
        print_revision (progname, revision);
 
+       printf (_("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n"));
        printf (_(COPYRIGHT), copyright, email);
 
        print_usage ();

diff --git a/plugins/check_dummy.c b/plugins/check_dummy.c
index 3db5238f8eb3ce1837e7c77728d2559bf111b220..9ca7a3aba071e503e8d0a613561ff92c68c37078 100644 (file)
--- a/plugins/check_dummy.c
+++ b/plugins/check_dummy.c
@@ -34,6 +34,10 @@ main (int argc, char **argv)
 {
        int result;
 
+       setlocale (LC_ALL, "");
+       bindtextdomain (PACKAGE, LOCALEDIR);
+       textdomain (PACKAGE);
+
        if (argc != 2)
                usage (_("Incorrect number of arguments supplied\n"));
        else if (strcmp (argv[1], "-V") == 0 || strcmp (argv[1], "--version") == 0) {

diff --git a/plugins/check_fping.c b/plugins/check_fping.c
index bb178305319e855dce9f46f67b2b888928454fff..0753cf3d1ab8122be6091dd41104c1a8ef587ccb 100644 (file)
--- a/plugins/check_fping.c
+++ b/plugins/check_fping.c
@@ -69,6 +69,10 @@ main (int argc, char **argv)
        char *input_buffer = NULL;
        input_buffer = malloc (MAX_INPUT_BUFFER);
 
+       setlocale (LC_ALL, "");
+       bindtextdomain (PACKAGE, LOCALEDIR);
+       textdomain (PACKAGE);
+
        if (process_arguments (argc, argv) == ERROR)
                usage (_("Could not parse arguments\n"));
 

diff --git a/plugins/check_game.c b/plugins/check_game.c
index d5de13dbaa96828dc3dbc76b2737611ddbbed4d4..dd16777322a7e10a2b5d82e104775863b08c2fa0 100644 (file)
--- a/plugins/check_game.c
+++ b/plugins/check_game.c
@@ -60,6 +60,10 @@ main (int argc, char **argv)
        char *p, *ret[QSTAT_MAX_RETURN_ARGS];
        int i;
 
+       setlocale (LC_ALL, "");
+       bindtextdomain (PACKAGE, LOCALEDIR);
+       textdomain (PACKAGE);
+
        result = process_arguments (argc, argv);
 
        if (result != OK) {

diff --git a/plugins/check_hpjd.c b/plugins/check_hpjd.c
index edde341e9e3dce5d4a9102a027a33034c359bda8..72f6bd7e2717f598c5b69e6e0b4cc36e02f9654d 100644 (file)
--- a/plugins/check_hpjd.c
+++ b/plugins/check_hpjd.c
@@ -79,6 +79,10 @@ main (int argc, char **argv)
 
        errmsg = malloc(MAX_INPUT_BUFFER);
 
+       setlocale (LC_ALL, "");
+       bindtextdomain (PACKAGE, LOCALEDIR);
+       textdomain (PACKAGE);
+
        if (process_arguments (argc, argv) != OK)
                usage (_("Invalid command arguments supplied\n"));
 
@@ -374,6 +378,7 @@ print_help (void)
 {
        print_revision (progname, revision);
 
+       printf (_("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n"));
        printf (_(COPYRIGHT), copyright, email);
 
        printf (_("\

diff --git a/plugins/check_http.c b/plugins/check_http.c
index 2908c007bdba5f2f4937b181ccadc9008b317e1f..3ec9e4992211ce2fe3a6b7368f4533dd3b691a77 100644 (file)
--- a/plugins/check_http.c
+++ b/plugins/check_http.c
@@ -815,7 +815,7 @@ redir (char *pos, char *status_line)
                        else if (sscanf (pos, HD5, url) == 1) {
                                /* relative url */
                                if ((url[0] != '/')) {
-                                       if (x = strrchr(url, '/'))
+                                       if ((x = strrchr(url, '/')))
                                                *x = '\0';
                                        asprintf (&server_url, "%s/%s", server_url, url);
                                }

diff --git a/plugins/check_ide-smart.c b/plugins/check_ide-smart.c
index ecd8a4e1fefd60f614e00187d99f4f42c040ba75..e1f1e747c046d6e44d56c62b955db3479b0d3b5c 100644 (file)
--- a/plugins/check_ide-smart.c
+++ b/plugins/check_ide-smart.c
@@ -396,6 +396,10 @@ main (int argc, char *argv[])
                {"version", no_argument, 0, 'V'}, {0, 0, 0, 0} 
        };
 
+       setlocale (LC_ALL, "");
+       bindtextdomain (PACKAGE, LOCALEDIR);
+       textdomain (PACKAGE);
+
        while (1) {
                
                o = getopt_long (argc, argv, "+d:iq10nhV", longopts, &longindex);

diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c
index d2c6ae22b7662d1b3731fc0e7a7e9cd7de8572de..adfa966a9c13dad9964ac06b6f199e88109ee302 100644 (file)
--- a/plugins/check_ldap.c
+++ b/plugins/check_ldap.c
@@ -64,6 +64,10 @@ main (int argc, char *argv[])
        int t_diff;
        time_t time0, time1;
 
+       setlocale (LC_ALL, "");
+       bindtextdomain (PACKAGE, LOCALEDIR);
+       textdomain (PACKAGE);
+
        if (process_arguments (argc, argv) == ERROR)
                usage (_("check_ldap: could not parse arguments\n"));
 

diff --git a/plugins/check_load.c b/plugins/check_load.c
index c12cad37aa517754a159e5cd54d3e8cddb046dbc..58113817008618dfb657e8da9546fb4e8b10d41c 100644 (file)
--- a/plugins/check_load.c
+++ b/plugins/check_load.c
@@ -71,6 +71,10 @@ main (int argc, char **argv)
 
        float la1, la5, la15;
 
+       setlocale (LC_ALL, "");
+       bindtextdomain (PACKAGE, LOCALEDIR);
+       textdomain (PACKAGE);
+
        if (process_arguments (argc, argv) == ERROR)
                usage ("failed processing arguments\n");
 

diff --git a/plugins/check_mrtg.c b/plugins/check_mrtg.c
index 849e636fce964dd4c5e9e2c9c170176a1f88a195..5d429d7d7dbba79ad42afba15d53b948ac3333ab 100644 (file)
--- a/plugins/check_mrtg.c
+++ b/plugins/check_mrtg.c
@@ -53,6 +53,10 @@ main (int argc, char **argv)
        unsigned long maximum_value_rate = 0L;
        unsigned long value_rate = 0L;
 
+       setlocale (LC_ALL, "");
+       bindtextdomain (PACKAGE, LOCALEDIR);
+       textdomain (PACKAGE);
+
        if (process_arguments (argc, argv) != OK)
                usage (_("Invalid command arguments supplied\n"));
 

diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
index a7afa52f12101809fc738463e936c258e03e211f..d62bfc8777c068b43e2f23278a3ae386ce91547e 100644 (file)
--- a/plugins/check_mysql.c
+++ b/plugins/check_mysql.c
@@ -43,6 +43,10 @@ main (int argc, char **argv)
        MYSQL mysql;
        char *result = NULL;
 
+       setlocale (LC_ALL, "");
+       bindtextdomain (PACKAGE, LOCALEDIR);
+       textdomain (PACKAGE);
+
        if (process_arguments (argc, argv) != OK)
                usage (_("Invalid command arguments supplied\n"));
 

diff --git a/plugins/check_nagios.c b/plugins/check_nagios.c
index 5b21ba1d93ce269042cf066cc4fd272de54ca95f..27bb0103d3fcf446ea950e5bf873c9981c813863 100644 (file)
--- a/plugins/check_nagios.c
+++ b/plugins/check_nagios.c
@@ -56,6 +56,10 @@ main (int argc, char **argv)
        char *procargs;
        int pos, cols;
 
+       setlocale (LC_ALL, "");
+       bindtextdomain (PACKAGE, LOCALEDIR);
+       textdomain (PACKAGE);
+
        if (process_arguments (argc, argv) == ERROR)
                usage (_("Could not parse arguments\n"));
 

diff --git a/plugins/check_nt.c b/plugins/check_nt.c
index 3b2bd5e1178db98725bfb8c29867db0b3733a60d..c0d6c4e5c296e7e3db39c668f5ad1e54cc651ae2 100644 (file)
--- a/plugins/check_nt.c
+++ b/plugins/check_nt.c
@@ -96,6 +96,10 @@ int main(int argc, char **argv){
        int uphours=0;
        int upminutes=0;
 
+       setlocale (LC_ALL, "");
+       bindtextdomain (PACKAGE, LOCALEDIR);
+       textdomain (PACKAGE);
+
        if(process_arguments(argc,argv)==ERROR)
                usage(_("Could not parse arguments\n"));
 

diff --git a/plugins/check_nwstat.c b/plugins/check_nwstat.c
index 92a1f117617c3cd7f0ae0c7e3d63eef30ba4f6c8..4ceb58fcc8770372be3264ec1147f78c29cdea5e 100644 (file)
--- a/plugins/check_nwstat.c
+++ b/plugins/check_nwstat.c
@@ -117,6 +117,10 @@ main(int argc, char **argv) {
        unsigned long sap_entries=0;
        char uptime[MAX_INPUT_BUFFER];
 
+       setlocale (LC_ALL, "");
+       bindtextdomain (PACKAGE, LOCALEDIR);
+       textdomain (PACKAGE);
+
        if (process_arguments(argc,argv)==ERROR)
                usage(_("Could not parse arguments\n"));
 

diff --git a/plugins/check_overcr.c b/plugins/check_overcr.c
index 67fb5d1f7403a2348eefa410b6dd35ca841b09b5..581db50fa38cedd59020edf6f8a5ff236954ef0d 100644 (file)
--- a/plugins/check_overcr.c
+++ b/plugins/check_overcr.c
@@ -79,6 +79,10 @@ main (int argc, char **argv)
        int uptime_hours = 0;
        int uptime_minutes = 0;
 
+       setlocale (LC_ALL, "");
+       bindtextdomain (PACKAGE, LOCALEDIR);
+       textdomain (PACKAGE);
+
        if (process_arguments (argc, argv) == ERROR)
                usage ("Could not parse arguments\n");
 

diff --git a/plugins/check_pgsql.c b/plugins/check_pgsql.c
index 6cd217e09cc2a5e6931a62363db8656b962abf04..16b9a96e1b1f2306242c54a0dd4160e08a1dd9be 100644 (file)
--- a/plugins/check_pgsql.c
+++ b/plugins/check_pgsql.c
@@ -128,6 +128,10 @@ main (int argc, char **argv)
        pgoptions = NULL;  /* special options to start up the backend server */
        pgtty = NULL;      /* debugging tty for the backend server */
 
+       setlocale (LC_ALL, "");
+       bindtextdomain (PACKAGE, LOCALEDIR);
+       textdomain (PACKAGE);
+
        if (process_arguments (argc, argv) == ERROR)
                usage ("Could not parse arguments");
 

diff --git a/plugins/check_ping.c b/plugins/check_ping.c
index 7d9dd3bff17552556ae572401ddd380073d56834..191fbedf34e2769177f6eb11b5170d1c0fc994ec 100644 (file)
--- a/plugins/check_ping.c
+++ b/plugins/check_ping.c
@@ -70,6 +70,10 @@ main (int argc, char **argv)
        int this_result = STATE_UNKNOWN;
        int i;
 
+       setlocale (LC_ALL, "");
+       bindtextdomain (PACKAGE, LOCALEDIR);
+       textdomain (PACKAGE);
+
        addresses = malloc ((size_t)max_addr);
 
        if (process_arguments (argc, argv) == ERROR)

diff --git a/plugins/check_procs.c b/plugins/check_procs.c
index 5313b977e0e0760759775aac59b916ad6e318c8d..8a3f7ac2f543522ab399d6f9e286b4ac75d3f988 100644 (file)
--- a/plugins/check_procs.c
+++ b/plugins/check_procs.c
@@ -103,6 +103,10 @@ main (int argc, char **argv)
 
        int result = STATE_UNKNOWN;
 
+       setlocale (LC_ALL, "");
+       bindtextdomain (PACKAGE, LOCALEDIR);
+       textdomain (PACKAGE);
+
        asprintf (&metric_name, "PROCS");
        metric = METRIC_PROCS;
 

diff --git a/plugins/check_radius.c b/plugins/check_radius.c
index 1e4fff7a855061ff5c7df113f58554bb44e2e8cf..d56222f98cc0ea10d1fa071a8e6c683b19aae01d 100644 (file)
--- a/plugins/check_radius.c
+++ b/plugins/check_radius.c
@@ -103,6 +103,10 @@ main (int argc, char **argv)
        UINT4 client_id;
        char *str;
 
+       setlocale (LC_ALL, "");
+       bindtextdomain (PACKAGE, LOCALEDIR);
+       textdomain (PACKAGE);
+
        if (process_arguments (argc, argv) == ERROR)
                usage (_("Could not parse arguments\n"));
 

diff --git a/plugins/check_real.c b/plugins/check_real.c
index 3e8475a7f729535dd5fff5391241b3e2ca437223..05e39d794eb55a0f7c58ad7b43c8dd0053545e6c 100644 (file)
--- a/plugins/check_real.c
+++ b/plugins/check_real.c
@@ -61,6 +61,10 @@ main (int argc, char **argv)
        char buffer[MAX_INPUT_BUFFER];
        char *status_line = NULL;
 
+       setlocale (LC_ALL, "");
+       bindtextdomain (PACKAGE, LOCALEDIR);
+       textdomain (PACKAGE);
+
        if (process_arguments (argc, argv) != OK)
                usage (_("Invalid command arguments supplied\n"));
 

diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c
index b35ebbc093ad9a2c82744feac18b0b428ad6e0d8..8440aab14ddfbf946f1924fc865e47bf760abf1d 100644 (file)
--- a/plugins/check_smtp.c
+++ b/plugins/check_smtp.c
@@ -66,6 +66,10 @@ main (int argc, char **argv)
        char *helocmd = NULL;
        struct timeval tv;
 
+       setlocale (LC_ALL, "");
+       bindtextdomain (PACKAGE, LOCALEDIR);
+       textdomain (PACKAGE);
+
        if (process_arguments (argc, argv) != OK)
                usage (_("Invalid command arguments supplied\n"));
 

diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index af8f11983b10f9713df73861126579ce1a48bbf9..cb985cab78aca9b2180342e403a0902d39688ef1 100644 (file)
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
@@ -137,6 +137,10 @@ main (int argc, char **argv)
        char *p2 = NULL;
        char *show = NULL;
 
+       setlocale (LC_ALL, "");
+       bindtextdomain (PACKAGE, LOCALEDIR);
+       textdomain (PACKAGE);
+
        labels = malloc (labels_size);
        unitv = malloc (unitv_size);
        for (i = 0; i < MAX_OIDS; i++)
@@ -443,7 +447,8 @@ process_arguments (int argc, char **argv)
                case 't':       /* timeout period */
                        if (!is_integer (optarg))
                                usage2 (_("Timeout Interval must be an integer"), optarg);
-                       timeout_interval = atoi (optarg);
+                       else
+                               timeout_interval = atoi (optarg);
                        break;
 
        /* Test parameters */

diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c
index 26709a7d91e4fd7a5cb7fc49fc7789885d0348ef..79e17017ba24755631d0891df01336fc81acd13c 100644 (file)
--- a/plugins/check_ssh.c
+++ b/plugins/check_ssh.c
@@ -48,6 +48,10 @@ main (int argc, char **argv)
 {
        int result;
 
+       setlocale (LC_ALL, "");
+       bindtextdomain (PACKAGE, LOCALEDIR);
+       textdomain (PACKAGE);
+
        if (process_arguments (argc, argv) == ERROR)
                usage (_("Could not parse arguments\n"));
 

diff --git a/plugins/check_swap.c b/plugins/check_swap.c
index a4e7e81420b8c66f72f74e63e85889d79bfeb9ac..3bbea77bd7c34655947e956f36d47932b305cf02 100644 (file)
--- a/plugins/check_swap.c
+++ b/plugins/check_swap.c
@@ -71,6 +71,10 @@ main (int argc, char **argv)
        char str[32];
        char *status;
 
+       setlocale (LC_ALL, "");
+       bindtextdomain (PACKAGE, LOCALEDIR);
+       textdomain (PACKAGE);
+
        status = strdup("");
 
        if (process_arguments (argc, argv) != OK)
@@ -205,8 +209,6 @@ int
 process_arguments (int argc, char **argv)
 {
        int c = 0;  /* option character */
-       int wc = 0; /* warning counter  */
-       int cc = 0; /* critical counter */
 
        int option = 0;
        static struct option longopts[] = {
@@ -229,7 +231,7 @@ process_arguments (int argc, char **argv)
                        break;
 
                switch (c) {
-               case 'w':                                                                       /* warning time threshold */
+               case 'w':                                                                       /* warning size threshold */
                        if (is_intnonneg (optarg)) {
                                warn_size = atoi (optarg);
                                break;
@@ -246,7 +248,7 @@ process_arguments (int argc, char **argv)
                        else {
                                usage (_("Warning threshold must be integer or percentage!\n"));
                        }
-               case 'c':                                                                       /* critical time threshold */
+               case 'c':                                                                       /* critical size threshold */
                        if (is_intnonneg (optarg)) {
                                crit_size = atoi (optarg);
                                break;

diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c
index bf8ed8caf6716df7bd99074820edbd76ebaa6439..a660649cbedc21419beb8fcae0913062a2e366bb 100644 (file)
--- a/plugins/check_tcp.c
+++ b/plugins/check_tcp.c
@@ -16,8 +16,8 @@
 
 *****************************************************************************/
 
-/* progname changes depending on symlink called */
-char *progname = "check_tcp";
+/* progname "check_tcp" changes depending on symlink called */
+char *progname;
 const char *revision = "$Revision$";
 const char *copyright = "1999-2003";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
@@ -198,6 +198,7 @@ main (int argc, char **argv)
                PORT = 119;
        }
        else {
+               progname = strdup ("check_tcp");
                usage (_("ERROR: Generic check_tcp called with unknown service\n"));
        }
 
@@ -592,6 +593,7 @@ print_help (void)
 {
        print_revision (progname, revision);
 
+       printf (_("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n"));
        printf (_(COPYRIGHT), copyright, email);
 
        printf (_("This plugin tests %s connections with the specified host.\n\n"),

diff --git a/plugins/check_time.c b/plugins/check_time.c
index e6c3c7167cdb0d4ed098db8044ce666f248524de..f73005d5f3aaab0be2f64ab5b97553741fedae15 100644 (file)
--- a/plugins/check_time.c
+++ b/plugins/check_time.c
@@ -55,6 +55,10 @@ main (int argc, char **argv)
        int sd;
        int result;
 
+       setlocale (LC_ALL, "");
+       bindtextdomain (PACKAGE, LOCALEDIR);
+       textdomain (PACKAGE);
+
        if (process_arguments (argc, argv) != OK)
                usage (_("Invalid command arguments supplied\n"));
 

diff --git a/plugins/check_udp.c b/plugins/check_udp.c
index 5aaf3a7924240a26fcf4a390878837d68944194c..c4fbbf85d2bac812e9bcc5b165ee850abbcde8e3 100644 (file)
--- a/plugins/check_udp.c
+++ b/plugins/check_udp.c
@@ -45,6 +45,10 @@ main (int argc, char **argv)
        int result;
        char recv_buffer[MAX_INPUT_BUFFER];
 
+       setlocale (LC_ALL, "");
+       bindtextdomain (PACKAGE, LOCALEDIR);
+       textdomain (PACKAGE);
+
        if (process_arguments (argc, argv) == ERROR)
                usage ("\n");
 

diff --git a/plugins/check_ups.c b/plugins/check_ups.c
index 7e7b36a4b01882e3b429d148618b2679fd19934c..391c1dbe6cc7e539c74243d9bfd3da6793133c4a 100644 (file)
--- a/plugins/check_ups.c
+++ b/plugins/check_ups.c
@@ -79,8 +79,12 @@ main (int argc, char **argv)
        int result = STATE_OK;
        char *message;
        char temp_buffer[MAX_INPUT_BUFFER];
-
        double ups_utility_deviation = 0.0;
+
+       setlocale (LC_ALL, "");
+       bindtextdomain (PACKAGE, LOCALEDIR);
+       textdomain (PACKAGE);
+
        ups_status = strdup ("N/A");
 
        if (process_arguments (argc, argv) != OK)

diff --git a/plugins/check_users.c b/plugins/check_users.c
index 9f308bc3f9b76fe038e59c5f0fa7355434dfd264..3705ee100bd511a787c0e4b68b25307dc11f07b7 100644 (file)
--- a/plugins/check_users.c
+++ b/plugins/check_users.c
@@ -41,6 +41,10 @@ main (int argc, char **argv)
        int result = STATE_OK;
        char input_buffer[MAX_INPUT_BUFFER];
 
+       setlocale (LC_ALL, "");
+       bindtextdomain (PACKAGE, LOCALEDIR);
+       textdomain (PACKAGE);
+
        if (process_arguments (argc, argv) == ERROR)
                usage (_("Could not parse arguments\n"));
 

diff --git a/plugins/negate.c b/plugins/negate.c
index c24658afce96e86451513b611434bb697c14c62c..874aea14ff6c2958ea701b20ae7a3238cb077cef 100644 (file)
--- a/plugins/negate.c
+++ b/plugins/negate.c
@@ -75,6 +75,10 @@ main (int argc, char **argv)
        int found = 0, result = STATE_UNKNOWN;
        char *buf;
 
+       setlocale (LC_ALL, "");
+       bindtextdomain (PACKAGE, LOCALEDIR);
+       textdomain (PACKAGE);
+
        if (process_arguments (argc, argv) == ERROR)
                usage (_("Could not parse arguments\n"));
 

diff --git a/plugins/urlize.c b/plugins/urlize.c
index f4bc67b39c1f9492261610fe314c0a28eb6e0a89..45766d0c43697aa6f5e105a4b7e0f3f559336b35 100644 (file)
--- a/plugins/urlize.c
+++ b/plugins/urlize.c
@@ -45,6 +45,10 @@ main (int argc, char **argv)
                {0, 0, 0, 0}
        };
 
+       setlocale (LC_ALL, "");
+       bindtextdomain (PACKAGE, LOCALEDIR);
+       textdomain (PACKAGE);
+
        while (1) {
                c = getopt_long (argc, argv, "+hVu:", longopts, &option);