diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
index dba43c5f4ddada1d187c98bbc8802e91ca0b4f5a..1e7a82f92011eb5a6bec752b379b4252e1a3f22d 100644 (file)
--- a/plugins/check_mysql.c
+++ b/plugins/check_mysql.c
const char *progname = "check_mysql";
const char *revision = "$Revision$";
-const char *copyright = "1999-2002";
+const char *copyright = "1999-2004";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
#define SLAVERESULTSIZE 40
#include "common.h"
#include "utils.h"
#include "netutils.h"
+
#include <mysql/mysql.h>
#include <mysql/errmsg.h>
void print_help (void);
void print_usage (void);
+
+
int
main (int argc, char **argv)
{
MYSQL mysql;
MYSQL_RES *res;
MYSQL_ROW row;
+
+ /* should be status */
+
char *result = NULL;
char slaveresult[SLAVERESULTSIZE];
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
- if (process_arguments (argc, argv) != OK)
- usage (_("Incorrect arguments supplied\n"));
+ if (process_arguments (argc, argv) == ERROR)
+ usage4 (_("Could not parse arguments"));
/* initialize mysql */
mysql_init (&mysql);
-
-
/* process command-line arguments */
int
process_arguments (int argc, char **argv)
db_host = optarg;
}
else {
- usage (_("Invalid host name\n"));
+ usage2 (_("Invalid hostname/address"), optarg);
}
break;
case 'd': /* hostname */
print_help ();
exit (STATE_OK);
case '?': /* help */
- usage (_("Invalid argument\n"));
+ printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
+ print_usage ();
+ exit (STATE_UNKNOWN);
}
}
db_host = argv[c++];
}
else {
- usage ("Invalid host name");
+ usage2 (_("Invalid hostname/address"), optarg);
}
else if (strlen(db_user) == 0)
db_user = argv[c++];
-
-
int
validate_arguments (void)
{
-
-
-\f
void
print_help (void)
{
@@ -304,12 +305,10 @@ a server listening on MySQL standard port %d will be checked\n"), MYSQL_PORT);
-
void
print_usage (void)
{
- printf (_("\
-Usage: %s [-d database] [-H host] [-P port] [-u user] [-p password] [-S]\n"),
+ printf ("\
+Usage: %s [-d database] [-H host] [-P port] [-u user] [-p password] [-S]\n",
progname);
- printf (_(UT_HLP_VRS), progname, progname);
}