Received-SPF: pass (google.com: best guess record for domain of linux-bluetooth-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Olivier Martin <olivier@labapart.com>
To:     linux-bluetooth@vger.kernel.org
Cc:     Olivier Martin <olivier@labapart.com>
Subject: [PATCH BlueZ v2] emulator: Fix command line parameters with optional argument
Date:   Tue,  7 Apr 2020 21:40:59 +0200
Message-Id: <20200407194059.5734-1-olivier@labapart.com>
Sender: linux-bluetooth-owner@vger.kernel.org
Precedence: bulk

Some parameters were missing the indication that additional
argument could be expected.
---
 btio/btio.c     | 8 ++++++--
 emulator/main.c | 6 ++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/btio/btio.c b/btio/btio.c
index e7b4db16b..56c59f84e 100644
--- a/btio/btio.c
+++ b/btio/btio.c
@@ -1676,12 +1676,16 @@ GIOChannel *bt_io_connect(BtIOConnect connect, gpointer user_data,
 	ret = parse_set_opts(&opts, gerr, opt1, args);
 	va_end(args);
 
-	if (ret == FALSE)
+	if (ret == FALSE) {
+		fprintf(stderr, "bt_io_connect(type:%d) err1\n", opts.type);
 		return NULL;
+	}
 
 	io = create_io(FALSE, &opts, gerr);
-	if (io == NULL)
+	if (io == NULL) {
+		fprintf(stderr, "bt_io_connect(type:%d) err2\n", opts.type);
 		return NULL;
+	}
 
 	sock = g_io_channel_unix_get_fd(io);
 
diff --git a/emulator/main.c b/emulator/main.c
index 68c53488e..75cb79c7b 100644
--- a/emulator/main.c
+++ b/emulator/main.c
@@ -56,10 +56,12 @@ static void usage(void)
 	printf("options:\n"
 		"\t-S                    Create local serial port\n"
 		"\t-s                    Create local server sockets\n"
-		"\t-l [num]              Number of local controllers\n"
+		"\t-l[num]               Number of local controllers\n"
 		"\t-L                    Create LE only controller\n"
+		"\t-U[num]               Number of test LE controllers\n"
 		"\t-B                    Create BR/EDR only controller\n"
 		"\t-A                    Create AMP controller\n"
+		"\t-T[num]               Number of test AMP controllers\n"
 		"\t-h, --help            Show help options\n");
 }
 
@@ -97,7 +99,7 @@ int main(int argc, char *argv[])
 	for (;;) {
 		int opt;
 
-		opt = getopt_long(argc, argv, "Ssl::LBAUTvh",
+		opt = getopt_long(argc, argv, "Ssl::LBAU::T::vh",
 						main_options, NULL);
 		if (opt < 0)
 			break;
-- 
2.17.1