From: Julien Fortin <julien@cumulusnetworks.com>
Date: Thu, 17 Aug 2017 17:35:49 +0000 (-0700)
Subject: ip: add new command line argument -json (mutually exclusive with -color)
X-Git-Tag: v4.14.0~39^2~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5df607725928d532a3b7e5095c04e943b2c3ce7f;p=thirdparty%2Fiproute2.git

ip: add new command line argument -json (mutually exclusive with -color)

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
---

diff --git a/include/utils.h b/include/utils.h
index 6080b962f..565bda600 100644
--- a/include/utils.h
+++ b/include/utils.h
@@ -20,6 +20,7 @@ extern int show_raw;
 extern int resolve_hosts;
 extern int oneline;
 extern int brief;
+extern int json;
 extern int timestamp;
 extern int timestamp_short;
 extern const char * _SL_;
diff --git a/ip/ip.c b/ip/ip.c
index 7c14a8ec1..e66f69700 100644
--- a/ip/ip.c
+++ b/ip/ip.c
@@ -33,6 +33,7 @@ int show_details;
 int resolve_hosts;
 int oneline;
 int brief;
+int json;
 int timestamp;
 const char *_SL_;
 int force;
@@ -258,6 +259,8 @@ int main(int argc, char **argv)
 			batch_file = argv[1];
 		} else if (matches(opt, "-brief") == 0) {
 			++brief;
+		} else if (matches(opt, "-json") == 0) {
+			++json;
 		} else if (matches(opt, "-rcvbuf") == 0) {
 			unsigned int size;
 
@@ -292,6 +295,9 @@ int main(int argc, char **argv)
 
 	_SL_ = oneline ? "\\" : "\n";
 
+	if (json)
+		check_if_color_enabled();
+
 	if (batch_file)
 		return batch(batch_file);