Removed old terminate function (Bug 1093491)

[nagiosplug.git] / plugins / check_pgsql.c

diff --git a/plugins/check_pgsql.c b/plugins/check_pgsql.c
index bbf47f07be755ec298d22ee5271f424090953e49..d56ce9b0e2b5e5264440e552c939c24c325df915 100644 (file)
--- a/plugins/check_pgsql.c
+++ b/plugins/check_pgsql.c
@@ -18,6 +18,17 @@
  
  *****************************************************************************/
 
+const char *progname = "check_pgsql";
+const char *revision = "$Revision$";
+const char *copyright = "1999-2004";
+const char *email = "nagiosplug-devel@lists.sourceforge.net";
+
+#include "common.h"
+#include "utils.h"
+
+#include "netutils.h"
+#include <libpq-fe.h>
+
 #define DEFAULT_DB "template1"
 #define DEFAULT_HOST "127.0.0.1"
 
@@ -27,10 +38,7 @@ enum {
        DEFAULT_CRIT = 8
 };
 
-#include "common.h"
-#include "utils.h"
-#include "netutils.h"
-#include <libpq-fe.h>
+
 
 int process_arguments (int, char **);
 int validate_arguments (void);
@@ -53,11 +61,6 @@ double tcrit = (double)DEFAULT_CRIT;
 PGconn *conn;
 /*PGresult   *res;*/
 
-const char *progname = "check_pgsql";
-const char *revision = "$Revision$";
-const char *copyright = "1999-2003";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
-
 
 /******************************************************************************
 
@@ -118,7 +121,8 @@ Please note that all tags must be lowercase to use the DocBook XML DTD.
 int
 main (int argc, char **argv)
 {
-       int elapsed_time, status;
+       int elapsed_time;
+       int status = STATE_UNKNOWN;
 
        /* begin, by setting the parameters for a backend connection if the
         * parameters are null, then the system will try to use reasonable
@@ -132,13 +136,12 @@ main (int argc, char **argv)
        bindtextdomain (PACKAGE, LOCALEDIR);
        textdomain (PACKAGE);
 
-       if (process_arguments (argc, argv) != OK)
-               usage (_("check_pgsql: could not parse arguments\n"));
+       if (process_arguments (argc, argv) == ERROR)
+               usage4 (_("Could not parse arguments"));
 
        /* Set signal handling and alarm */
        if (signal (SIGALRM, timeout_alarm_handler) == SIG_ERR) {
-               printf (_("Cannot catch SIGALRM"));
-               return STATE_UNKNOWN;
+               usage4 (_("Cannot catch SIGALRM"));
        }
        alarm (timeout_interval);
 
@@ -206,9 +209,7 @@ process_arguments (int argc, char **argv)
 
                switch (c) {
                case '?':     /* usage */
-                       printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
-                       print_usage ();
-                       exit (STATE_UNKNOWN);
+                       usage2 (_("Unknown argument"), optarg);
                case 'h':     /* help */
                        print_help ();
                        exit (STATE_OK);
@@ -229,7 +230,7 @@ process_arguments (int argc, char **argv)
                        break;
                case 'w':     /* warning time threshold */
                        if (!is_nonnegative (optarg))
-                               usage2 (_("Critical threshold must be a positive integer"), optarg);
+                               usage2 (_("Warning threshold must be a positive integer"), optarg);
                        else
                                twarn = strtod (optarg, NULL);
                        break;
@@ -253,7 +254,7 @@ process_arguments (int argc, char **argv)
                        break;
                case 'l':     /* login name */
                        if (!is_pg_logname (optarg))
-                               usage2 (_("user name is not valid"), optarg);
+                               usage2 (_("User name is not valid"), optarg);
                        else
                                pguser = optarg;
                        break;
@@ -388,7 +389,7 @@ print_help (void)
 
        print_revision (progname, revision);
 
-       printf (_(COPYRIGHT), copyright, email);
+       printf (COPYRIGHT, copyright, email);
 
        printf (_("Test whether a PostgreSQL Database is accepting connections.\n\n"));
 
@@ -400,7 +401,7 @@ print_help (void)
 
        printf (_(UT_IPv46));
 
-       printf (S_("\
+       printf (_("\
   -d, --database=STRING\n\
     Database to check (default: %s)\n\
   -l, --logname = STRING\n\
@@ -414,18 +415,18 @@ print_help (void)
 
        printf (_(UT_VERBOSE));
 
-       printf (S_("\nAll parameters are optional.\n\
+       printf (_("\nAll parameters are optional.\n\
 \n\
 This plugin tests a PostgreSQL DBMS to determine whether it is active and\n\
 accepting queries. In its current operation, it simply connects to the\n\
 specified database, and then disconnects. If no database is specified, it\n\
 connects to the template1 database, which is present in every functioning \n\
 PostgreSQL DBMS.\n"));
-       printf (S_("\n\
+       printf (_("\n\
 The plugin will connect to a local postmaster if no host is specified. To\n\
 connect to a remote host, be sure that the remote postmaster accepts TCP/IP\n\
 connections (start the postmaster with the -i option).\n"));
-       printf (S_("\n\
+       printf (_("\n\
 Typically, the nagios user (unless the --logname option is used) should be\n\
 able to connect to the database without a password. The plugin can also send\n\
 a password, but no effort is made to obsure or encrypt the password.\n"));
@@ -438,12 +439,7 @@ a password, but no effort is made to obsure or encrypt the password.\n"));
 void
 print_usage (void)
 {
-       printf (S_("\
-Usage:\n %s [-H <host>] [-P <port>] [-c <critical time>] [-w <warning time>]\n\
-            [-t <timeout>]"), progname);
-       printf (S_("[-d <database>] [-l <logname>] [-p <password>]\n"));
-       printf (S_("\
-         %s (-h | --help) for detailed help\n\
-         %s (-V | --version) for version information\n"),
-                                       progname, progname);
+       printf ("\
+Usage: %s [-H <host>] [-P <port>] [-c <critical time>] [-w <warning time>]\n\
+                  [-t <timeout>] [-d <database>] [-l <logname>] [-p <password>]\n", progname);
 }