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 6080b962fb41114ababb505104978a980a11ae65..565bda60097b5bdaf62e76538ec61998d556ae57 100644 (file)
--- 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 7c14a8ec18c0073125994d2459a68c4dff71a944..e66f69700105e82eb55a469b037aaf1107e15c42 100644 (file)
--- 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);