From d12fcc20dac8415a89898fdaa9bfabaac39e5e33 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Sat, 31 May 2008 07:34:14 +0000 Subject: [PATCH] libiproute: fix option parsing, so that "ip -o link" works again. closes bug 3524 --- libbb/compare_string_array.c | 4 ++-- networking/libiproute/ip_parse_common_args.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libbb/compare_string_array.c b/libbb/compare_string_array.c index 151b50817..ec7f94e79 100644 --- a/libbb/compare_string_array.c +++ b/libbb/compare_string_array.c @@ -23,7 +23,7 @@ int index_in_strings(const char *strings, const char *key) { int idx = 0; - while (strings[0]) { + while (*strings) { if (strcmp(strings, key) == 0) { return idx; } @@ -57,7 +57,7 @@ int index_in_substrings(const char *strings, const char *key) if (len) { int idx = 0; - while (strings[0]) { + while (*strings) { if (strncmp(strings, key, len) == 0) { return idx; } diff --git a/networking/libiproute/ip_parse_common_args.c b/networking/libiproute/ip_parse_common_args.c index 294bde540..5e4012b81 100644 --- a/networking/libiproute/ip_parse_common_args.c +++ b/networking/libiproute/ip_parse_common_args.c @@ -54,7 +54,7 @@ char **ip_parse_common_args(char **argv) break; } } - arg = index_in_strings(ip_common_commands, opt); + arg = index_in_substrings(ip_common_commands, opt); if (arg < 0) bb_show_usage(); if (arg == ARG_oneline) { -- 2.25.1