Fix argument processing (Felix Frank - 1690697)

git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1655 f882894a-f735-0410-b71e-b25c423dba1c

diff --git a/THANKS.in b/THANKS.in
index 6d674bc4728d58eb45fe8b0f4c61ac1ad813a52f..da6dd21371b58f4b2816b99eb9361c1ddb4f10a0 100644 (file)
--- a/THANKS.in
+++ b/THANKS.in
@@ -214,3 +214,4 @@ Enrico Scholz
 Marlo Bell
 Stefan Meier
 Mark Favas
+Felix Frank

diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
index 573ec96a8a4aecd6b266063f389cf0ba57f2fa39..dc8c491d12f5e0f49ed1aceab48b6db12c82a025 100644 (file)
--- a/plugins/check_mysql.c
+++ b/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++]);