[git commit] i2c-tools: fix 'i2cdetect -l'

Denys Vlasenko vda.linux at googlemail.com
Mon May 11 15:24:03 UTC 2015


commit: http://git.busybox.net/busybox/commit/?id=b2cca32a37b969cce3b3bce693708759d44d3d15
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

Calling 'i2cdetect -l' only displays usage and exits. Fix it by
correctly parsing command-line arguments.

Signed-off-by: Bartosz Golaszewski <bartekgola at gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 miscutils/i2c_tools.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/miscutils/i2c_tools.c b/miscutils/i2c_tools.c
index 03bb039..2805cf3 100644
--- a/miscutils/i2c_tools.c
+++ b/miscutils/i2c_tools.c
@@ -1284,13 +1284,16 @@ int i2cdetect_main(int argc UNUSED_PARAM, char **argv)
 	unsigned opts;
 
 	opt_complementary = "q--r:r--q:" /* mutually exclusive */
-    			"-1:?3"; /* from 1 to 3 args */
+			"?3"; /* up to 3 args */
 	opts = getopt32(argv, optstr);
 	argv += optind;
 
 	if (opts & opt_l)
 		list_i2c_busses_and_exit();
 
+	if (!argv[0])
+		bb_show_usage();
+
 	bus_num = i2c_bus_lookup(argv[0]);
 	fd = i2c_dev_open(bus_num);
 	get_funcs_matrix(fd, &funcs);


More information about the busybox-cvs mailing list