From b809d23c81021ab39000196af87e1dcac4ac291d Mon Sep 17 00:00:00 2001 From: Holger Weiss Date: Thu, 29 Mar 2007 17:58:28 +0000 Subject: Fix argument processing (Felix Frank - 1690697) git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1655 f882894a-f735-0410-b71e-b25c423dba1c --- THANKS.in | 1 + plugins/check_mysql.c | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/THANKS.in b/THANKS.in index 6d674bc4..da6dd213 100644 --- 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 573ec96a..dc8c491d 100644 --- 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++]); -- cgit v1.2.3-74-g34f1