X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fcheck_mysql.c;h=307481463371417e8f3cb36bf0294726008d7880;hb=b785fae376955045c2667073071678be647f0e17;hp=a4a2ed1d8ffbfc46b557d2d9e860f4bee100f804;hpb=41367d9625c1d8a854bdeef4c09511ad4d93b192;p=nagiosplug.git

diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
index a4a2ed1..3074814 100644
--- a/plugins/check_mysql.c
+++ b/plugins/check_mysql.c
@@ -14,7 +14,7 @@
 * This plugin is for testing a mysql server.
 ******************************************************************************/
 
-#define PROGNAME "check_mysql"
+const char *progname = "check_mysql";
 #define REVISION "$Revision$"
 #define COPYRIGHT "1999-2002"
 
@@ -32,7 +32,6 @@ unsigned int db_port = MYSQL_PORT;
 
 int process_arguments (int, char **);
 int validate_arguments (void);
-int check_disk (int usp, int free_disk);
 void print_help (void);
 void print_usage (void);
 
@@ -127,7 +126,6 @@ process_arguments (int argc, char **argv)
 {
 	int c;
 
-#ifdef HAVE_GETOPT_H
 	int option_index = 0;
 	static struct option long_options[] = {
 		{"hostname", required_argument, 0, 'H'},
@@ -140,18 +138,12 @@ process_arguments (int argc, char **argv)
 		{"help", no_argument, 0, 'h'},
 		{0, 0, 0, 0}
 	};
-#endif
 
 	if (argc < 1)
 		return ERROR;
 
 	while (1) {
-#ifdef HAVE_GETOPT_H
-		c =
-			getopt_long (argc, argv, "hVP:p:u:d:H:", long_options, &option_index);
-#else
-		c = getopt (argc, argv, "hVP:p:u:d:H:");
-#endif
+		c = getopt_long (argc, argv, "hVP:p:u:d:H:", long_options, &option_index);
 
 		if (c == -1 || c == EOF)
 			break;
@@ -178,7 +170,7 @@ process_arguments (int argc, char **argv)
 			db_port = atoi (optarg);
 			break;
 		case 'V':									/* version */
-			print_revision (PROGNAME, REVISION);
+			print_revision (progname, REVISION);
 			exit (STATE_OK);
 		case 'h':									/* help */
 			print_help ();
@@ -190,25 +182,26 @@ process_arguments (int argc, char **argv)
 
 	c = optind;
 
-	if (strlen(db_host) == 0 && argc > c)
-		if (is_host (argv[c])) {
-			db_host = argv[c++];
-		}
-		else {
-			usage ("Invalid host name");
-		}
-
-	if (strlen(db_user) == 0 && argc > c)
-		db_user = argv[c++];
-
-	if (strlen(db_pass) == 0 && argc > c)
-		db_pass = argv[c++];
-
-	if (strlen(db) == 0 && argc > c)
-		db = argv[c++];
+	while ( argc > c ) {
 
-	if (is_intnonneg (argv[c]))
-		db_port = atoi (argv[c++]);
+		if (strlen(db_host) == 0)
+			if (is_host (argv[c])) {
+				db_host = argv[c++];
+			}
+			else {
+				usage ("Invalid host name");
+			}
+		else if (strlen(db_user) == 0)
+			db_user = argv[c++];
+		else if (strlen(db_pass) == 0)
+			db_pass = argv[c++];
+		else if (strlen(db) == 0)
+			db = argv[c++];
+		else if (is_intnonneg (argv[c]))
+			db_port = atoi (argv[c++]);
+		else
+			break;
+	}
 
 	return validate_arguments ();
 }
@@ -230,7 +223,7 @@ validate_arguments (void)
 void
 print_help (void)
 {
-	print_revision (PROGNAME, REVISION);
+	print_revision (progname, REVISION);
 	printf
 		("Copyright (c) 2000 Didi Rieder/Karl DeBisschop\n\n"
 		 "This plugin is for testing a mysql server.\n");
@@ -267,5 +260,5 @@ print_usage (void)
 	printf
 		("Usage: %s [-d database] [-H host] [-P port] [-u user] [-p password]\n"
 		 "       %s --help\n"
-		 "       %s --version\n", PROGNAME, PROGNAME, PROGNAME);
+		 "       %s --version\n", progname, progname, progname);
 }