From: Gokul Sivakumar <gokulkumar792@gmail.com>
Date: Tue, 17 Aug 2021 17:28:05 +0000 (+0530)
Subject: bridge: reorder cmd line arg parsing to let "-c" detected as "color" option
X-Git-Tag: v5.14.0~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82149efee93924192ce83c03375b729ee003ca78;p=thirdparty%2Fiproute2.git

bridge: reorder cmd line arg parsing to let "-c" detected as "color" option

As per the man/man8/bridge.8 page, the shorthand cmd line arg "-c" can be
used to colorize the bridge cmd output. But while parsing the args in while
loop, matches() detects "-c" as "-compressedvlans" instead of "-color", so
fix this by doing the check for "-color" option first before checking for
"-compressedvlans".

Signed-off-by: Gokul Sivakumar <gokulkumar792@gmail.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---

diff --git a/bridge/bridge.c b/bridge/bridge.c
index f7bfe0b56..48b0e7f84 100644
--- a/bridge/bridge.c
+++ b/bridge/bridge.c
@@ -149,9 +149,9 @@ main(int argc, char **argv)
 			NEXT_ARG();
 			if (netns_switch(argv[1]))
 				exit(-1);
+		} else if (matches_color(opt, &color)) {
 		} else if (matches(opt, "-compressvlans") == 0) {
 			++compress_vlans;
-		} else if (matches_color(opt, &color)) {
 		} else if (matches(opt, "-force") == 0) {
 			++force;
 		} else if (matches(opt, "-json") == 0) {