From patchwork Thu Aug 17 17:35:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Fortin X-Patchwork-Id: 802789 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.b="aC8vuqau"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xYD514D71z9t4X for ; Fri, 18 Aug 2017 03:40:21 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753424AbdHQRkT (ORCPT ); Thu, 17 Aug 2017 13:40:19 -0400 Received: from mail-wr0-f174.google.com ([209.85.128.174]:37844 "EHLO mail-wr0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753393AbdHQRkR (ORCPT ); Thu, 17 Aug 2017 13:40:17 -0400 Received: by mail-wr0-f174.google.com with SMTP id z91so41306354wrc.4 for ; Thu, 17 Aug 2017 10:40:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cumulusnetworks.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=fm/KouAnL0UZEMseV/VXKeU7xrrIJJ1L/fXfqn/S79k=; b=aC8vuqauOTr5xTK3nIrZocHSgHfhd2KxIxzzOq49gYDBNYxvBw/39K76iJw9OkMip/ Lln8Mqit/XWXzoNJUvAm2peIDKqQg5bGtASN2xeXhzY5IxhMlKCXaJgrfymoGk4tAAHU 62Xnd+v2GOIxVqeu9BBG+vG1uP69v+MRGfWdE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=fm/KouAnL0UZEMseV/VXKeU7xrrIJJ1L/fXfqn/S79k=; b=cccz73uzhvzPy1b0rl7k0K3XlNShzBCUA5spmYO8g0lGBDLEwZ0ACqZWKaO0nqnyFz /T6FPYJGxL9rPdQjQI3JCcXcVQYf8qBXgK7Pmh3DSEjft05tLjGCUHRFEUIPc3yBQ6aZ LWdboQkSd7WGamsCW85C+jR9Np1v9/2xIw51WBRwXWrPOPC2NC5YsQikNMgPebDFEcn/ VS8KyyTBeBvkdnEFG10wYNyDmqD40p99GsfPkVpkoHkAD//kg7zyYjIrgKVSbnZdxNm8 20t1C4Ei9upyVIhHnyjClyYqh/EUrOKCQZScdxCh5tNni5D+rF5fQ46ocZiWolYAbKYt u/aQ== X-Gm-Message-State: AHYfb5iG9/KU5UtQSoEu/yuTjki9mAo8vf1nvzfBlrE7UrWKdom62Rj0 gZFrTPOmTDow4Px4S77Xb/Ei X-Received: by 10.28.55.4 with SMTP id e4mr1966211wma.37.1502991615623; Thu, 17 Aug 2017 10:40:15 -0700 (PDT) Received: from localhost.localdomain ([37.169.21.172]) by smtp.googlemail.com with ESMTPSA id k13sm3902040wrd.4.2017.08.17.10.40.11 (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 17 Aug 2017 10:40:15 -0700 (PDT) From: Julien Fortin X-Google-Original-From: Julien Fortin To: netdev@vger.kernel.org Cc: roopa@cumulusnetworks.com, nikolay@cumulusnetworks.com, dsa@cumulusnetworks.com, Julien Fortin Subject: [PATCH iproute2 json v2 02/27] ip: add new command line argument -json (mutually exclusive with -color) Date: Thu, 17 Aug 2017 10:35:49 -0700 Message-Id: <20170817173614.54987-3-julien@cumulusnetworks.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170817173614.54987-1-julien@cumulusnetworks.com> References: <20170817173614.54987-1-julien@cumulusnetworks.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Julien Fortin Signed-off-by: Julien Fortin --- include/utils.h | 1 + ip/ip.c | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/include/utils.h b/include/utils.h index 6080b962..565bda60 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 7c14a8ec..e66f6970 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);