diff --git a/plugins/check_pgsql.c b/plugins/check_pgsql.c
index 03614ab1a8a2662cfbe51824623b904b5104f0f2..e1484566328961e69b89652e19f6e9ff53c7f6ef 100644 (file)
--- a/plugins/check_pgsql.c
+++ b/plugins/check_pgsql.c
*
*****************************************************************************/
-#define PROGNAME "check_pgsql"
+const char *progname = "check_pgsql";
#define REVISION "$Revision$"
#define COPYRIGHT "1999-2001"
#define AUTHOR "Karl DeBisschop"
#define EMAIL "kdebisschop@users.sourceforge.net"
#define SUMMARY "Tests to see if a PostgreSQL DBMS is accepting connections.\n"
-#define OPTIONS "\
-\[-c critical_time] [-w warning_time] [-t timeout] [-H host]\n\
+#define OPTIONS "[-c critical_time] [-w warning_time] [-t timeout] [-H host]\n\
[-P port] [-d database] [-l logname] [-p password]"
#define LONGOPTIONS "\
-H, --hostname=STRING\n\
Name or numeric IP address of machine running backend\n\
-P, --port=INTEGER\n\
- Port running backend (default: %s)\n\
+ Port running backend (default: %d)\n\
-d, --database=STRING\n\
Database to check (default: %s)\n\
-l, --logname = STRING\n\
#define DEFAULT_DB "template1"
#define DEFAULT_HOST "127.0.0.1"
-#define DEFAULT_PORT "5432"
-#define DEFAULT_WARN 2
-#define DEFAULT_CRIT 8
-#define DEFAULT_TIMEOUT 30
+enum {
+ DEFAULT_PORT = 5432,
+ DEFAULT_WARN = 2,
+ DEFAULT_CRIT = 8,
+ DEFAULT_TIMEOUT = 30
+};
#include "config.h"
#include "common.h"
#include "utils.h"
-#include <netdb.h>
#include <libpq-fe.h>
int process_arguments (int, char **);
char *pghost = NULL; /* host name of the backend server */
char *pgport = NULL; /* port of the backend server */
-char default_port[4] = DEFAULT_PORT;
+int default_port = DEFAULT_PORT;
char *pgoptions = NULL;
char *pgtty = NULL;
char dbName[NAMEDATALEN] = DEFAULT_DB;
<manvolnum>5<manvolnum>
</refmeta>
<refnamdiv>
-<refname>&PROGNAME;</refname>
+<refname>&progname;</refname>
<refpurpose>&SUMMARY;</refpurpose>
</refnamdiv>
</refentry>
void
print_help (void)
{
- print_revision (PROGNAME, REVISION);
+ print_revision (progname, REVISION);
printf
("Copyright (c) %s %s <%s>\n\n%s\n",
COPYRIGHT, AUTHOR, EMAIL, SUMMARY);
print_usage (void)
{
printf ("Usage:\n" " %s %s\n"
-#ifdef HAVE_GETOPT_H
" %s (-h | --help) for detailed help\n"
" %s (-V | --version) for version information\n",
-#else
- " %s -h for detailed help\n"
- " %s -V for version information\n",
-#endif
- PROGNAME, OPTIONS, PROGNAME, PROGNAME);
+ progname, OPTIONS, progname, progname);
}
\f
{
int c;
-#ifdef HAVE_GETOPT_H
int option_index = 0;
static struct option long_options[] = {
{"help", no_argument, 0, 'h'},
{"database", required_argument, 0, 'd'},
{0, 0, 0, 0}
};
-#endif
while (1) {
-#ifdef HAVE_GETOPT_H
- c = getopt_long (argc, argv, "+?hVt:c:w:H:P:d:l:p:a:",
+ c = getopt_long (argc, argv, "hVt:c:w:H:P:d:l:p:a:",
long_options, &option_index);
-#else
- c = getopt (argc, argv, "+?hVt:c:w:H:P:d:l:p:a:");
-#endif
+
if (c == EOF)
break;
switch (c) {
- case '?': /* help */
- usage2 ("Unknown argument", optarg);
+ case '?': /* usage */
+ usage3 ("Unknown argument", optopt);
case 'h': /* help */
print_help ();
exit (STATE_OK);
case 'V': /* version */
- print_revision (PROGNAME, REVISION);
+ print_revision (progname, REVISION);
exit (STATE_OK);
case 't': /* timeout period */
if (!is_integer (optarg))