Selaa lähdekoodia

Fix argument processing (Felix Frank - 1690697)

git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1655 f882894a-f735-0410-b71e-b25c423dba1c
Holger Weiss 19 vuotta sitten
vanhempi
commit
b809d23c81
2 muutettua tiedostoa jossa 6 lisäystä ja 5 poistoa
  1. 1 0
      THANKS.in
  2. 5 5
      plugins/check_mysql.c

+ 1 - 0
THANKS.in

@@ -214,3 +214,4 @@ Enrico Scholz
 Marlo Bell
 Stefan Meier
 Mark Favas
+Felix Frank

+ 5 - 5
plugins/check_mysql.c

@@ -318,18 +318,18 @@ process_arguments (int argc, char **argv)
 
 	while ( argc > c ) {
 
-		if (strlen(db_host) == 0)
+		if (db_host == NULL)
 			if (is_host (argv[c])) {
 				db_host = argv[c++];
 			}
 			else {
-				usage2 (_("Invalid hostname/address"), optarg);
+				usage2 (_("Invalid hostname/address"), argv[c]);
 			}
-		else if (strlen(db_user) == 0)
+		else if (db_user == NULL)
 			db_user = argv[c++];
-		else if (strlen(db_pass) == 0)
+		else if (db_pass == NULL)
 			db_pass = argv[c++];
-		else if (strlen(db) == 0)
+		else if (db == NULL)
 			db = argv[c++];
 		else if (is_intnonneg (argv[c]))
 			db_port = atoi (argv[c++]);