Added checking for an empty command-line arguments

8 files changed, 18 insertions, 11 deletions

diff --git a/src/bt-adapter.c b/src/bt-adapter.c
index 5bdd779..76a26c3 100644
--- a/src/bt-adapter.c
+++ b/src/bt-adapter.c
@@ -26,6 +26,7 @@
 #endif

 

 #include <stdlib.h>

+#include <string.h>

 #include <glib.h>

 

 #include "lib/bluez-dbus.h"

@@ -122,7 +123,7 @@ int main(int argc, char *argv[])
 	} else if (!list_arg && !info_arg && !discover_arg && !set_arg) {

 		g_print("%s", g_option_context_get_help(context, FALSE, NULL));

 		exit(EXIT_FAILURE);

-	} else if (set_arg && argc != 3) {

+	} else if (set_arg && (argc != 3 || strlen(argv[1]) == 0 || strlen(argv[2]) == 0)) {

 		g_print("%s: Invalid arguments for --set\n", g_get_prgname());

 		g_print("Try `%s --help` for more information.\n", g_get_prgname());

 		exit(EXIT_FAILURE);

diff --git a/src/bt-agent.c b/src/bt-agent.c
index 4ba26dc..b6454fb 100644
--- a/src/bt-agent.c
+++ b/src/bt-agent.c
@@ -26,6 +26,7 @@
 #endif

 

 #include <stdlib.h>

+#include <string.h>

 #include <glib.h>

 

 #include "lib/bluez-dbus.h"

diff --git a/src/bt-audio.c b/src/bt-audio.c
index 663d915..6100331 100644
--- a/src/bt-audio.c
+++ b/src/bt-audio.c
@@ -26,6 +26,7 @@
 #endif
 
 #include <stdlib.h>
+#include <string.h>
 #include <glib.h>
 
 #include "lib/bluez-dbus.h"
@@ -75,7 +76,7 @@ int main(int argc, char *argv[])
 		g_print("%s: %s\n", g_get_prgname(), error->message);
 		g_print("Try `%s --help` for more information.\n", g_get_prgname());
 		exit(EXIT_FAILURE);
-	} else if (!connect_arg && !disconnect_arg) {
+	} else if ((!connect_arg || strlen(connect_arg) == 0) && (!disconnect_arg || strlen(disconnect_arg) == 0)) {
 		g_print("%s", g_option_context_get_help(context, FALSE, NULL));
 		exit(EXIT_FAILURE);
 	}
diff --git a/src/bt-device.c b/src/bt-device.c
index baeaba6..7051885 100644
--- a/src/bt-device.c
+++ b/src/bt-device.c
@@ -269,14 +269,14 @@ int main(int argc, char *argv[])
 		g_print("%s: %s\n", g_get_prgname(), error->message);
 		g_print("Try `%s --help` for more information.\n", g_get_prgname());
 		exit(EXIT_FAILURE);
-	} else if (!list_arg && !connect_arg && !remove_arg && !info_arg && !services_arg && !set_arg) {
+	} else if (!list_arg && (!connect_arg || strlen(connect_arg) == 0) && (!remove_arg || strlen(remove_arg) == 0) && (!info_arg || strlen(info_arg) == 0) && !services_arg && !set_arg) {
 		g_print("%s", g_option_context_get_help(context, FALSE, NULL));
 		exit(EXIT_FAILURE);
-	} else if (services_arg && argc != 2 && argc != 3) {
+	} else if (services_arg && (argc != 2 || strlen(argv[1]) == 0) && (argc != 3 || strlen(argv[1]) == 0)) {
 		g_print("%s: Invalid arguments for --services\n", g_get_prgname());
 		g_print("Try `%s --help` for more information.\n", g_get_prgname());
 		exit(EXIT_FAILURE);
-	} else if (set_arg && argc != 4) {
+	} else if (set_arg && (argc != 4 || strlen(argv[1]) == 0 || strlen(argv[2]) ==0 || strlen(argv[3]) == 0)) {
 		g_print("%s: Invalid arguments for --set\n", g_get_prgname());
 		g_print("Try `%s --help` for more information.\n", g_get_prgname());
 		exit(EXIT_FAILURE);
diff --git a/src/bt-input.c b/src/bt-input.c
index ab9e310..79cb27e 100644
--- a/src/bt-input.c
+++ b/src/bt-input.c
@@ -26,6 +26,7 @@
 #endif
 
 #include <stdlib.h>
+#include <string.h>
 #include <glib.h>
 
 #include "lib/bluez-dbus.h"
@@ -72,7 +73,7 @@ int main(int argc, char *argv[])
 		g_print("%s: %s\n", g_get_prgname(), error->message);
 		g_print("Try `%s --help` for more information.\n", g_get_prgname());
 		exit(EXIT_FAILURE);
-	} else if (!connect_arg && !disconnect_arg) {
+	} else if ((!connect_arg || strlen(connect_arg) == 0) && (!disconnect_arg || strlen(disconnect_arg) == 0)) {
 		g_print("%s", g_option_context_get_help(context, FALSE, NULL));
 		exit(EXIT_FAILURE);
 	}
diff --git a/src/bt-monitor.c b/src/bt-monitor.c
index 03f7bdb..589cbc2 100644
--- a/src/bt-monitor.c
+++ b/src/bt-monitor.c
@@ -26,6 +26,7 @@
 #endif
 
 #include <stdlib.h>
+#include <string.h>
 #include <glib.h>
 
 #include "lib/bluez-dbus.h"
diff --git a/src/bt-network.c b/src/bt-network.c
index f7cd678..faab904 100644
--- a/src/bt-network.c
+++ b/src/bt-network.c
@@ -26,6 +26,7 @@
 #endif
 
 #include <stdlib.h>
+#include <string.h>
 #include <glib.h>
 
 #include "lib/bluez-dbus.h"
@@ -93,14 +94,14 @@ int main(int argc, char *argv[])
 		g_print("%s: %s\n", g_get_prgname(), error->message);
 		g_print("Try `%s --help` for more information.\n", g_get_prgname());
 		exit(EXIT_FAILURE);
-	} else if (!connect_arg && !disconnect_arg && !service_arg) {
+	} else if (!connect_arg && (!disconnect_arg || strlen(disconnect_arg) == 0) && !service_arg) {
 		g_print("%s", g_option_context_get_help(context, FALSE, NULL));
 		exit(EXIT_FAILURE);
-	} else if (connect_arg && argc != 3) {
+	} else if (connect_arg && (argc != 3 || strlen(argv[1]) == 0 || strlen(argv[2]) == 0)) {
 		g_print("%s: Invalid arguments for --connect\n", g_get_prgname());
 		g_print("Try `%s --help` for more information.\n", g_get_prgname());
 		exit(EXIT_FAILURE);
-	} else if (service_arg && argc != 2 && argc != 4) {
+	} else if (service_arg && (argc != 2 || strlen(argv[1]) == 0) && (argc != 4 || strlen(argv[1]) == 0 || strlen(argv[2]) == 0 || strlen(argv[3]) == 0)) {
 		g_print("%s: Invalid arguments for --service\n", g_get_prgname());
 		g_print("Try `%s --help` for more information.\n", g_get_prgname());
 		exit(EXIT_FAILURE);
diff --git a/src/bt-serial.c b/src/bt-serial.c
index 5cb71b0..a93dfa0 100644
--- a/src/bt-serial.c
+++ b/src/bt-serial.c
@@ -26,6 +26,7 @@
 #endif
 
 #include <stdlib.h>
+#include <string.h>
 #include <glib.h>
 
 #include "lib/bluez-dbus.h"
@@ -76,11 +77,11 @@ int main(int argc, char *argv[])
 	} else if (!connect_arg && !disconnect_arg) {
 		g_print("%s", g_option_context_get_help(context, FALSE, NULL));
 		exit(EXIT_FAILURE);
-	} else if (connect_arg && argc != 3) {
+	} else if (connect_arg && (argc != 3 || strlen(argv[1]) == 0 || strlen(argv[2]) == 0)) {
 		g_print("%s: Invalid arguments for --connect\n", g_get_prgname());
 		g_print("Try `%s --help` for more information.\n", g_get_prgname());
 		exit(EXIT_FAILURE);
-	} else if (disconnect_arg && argc != 3) {
+	} else if (disconnect_arg && (argc != 3 || strlen(argv[1]) == 0 || strlen(argv[2]) == 0)) {
 		g_print("%s: Invalid arguments for --disconnect\n", g_get_prgname());
 		g_print("Try `%s --help` for more information.\n", g_get_prgname());
 		exit(EXIT_FAILURE);