From patchwork Fri Aug 3 17:49:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matteo Croce X-Patchwork-Id: 953337 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41hvgl1jBrz9s0R for ; Sat, 4 Aug 2018 03:49:38 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727613AbeHCTqz (ORCPT ); Fri, 3 Aug 2018 15:46:55 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:54783 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727433AbeHCTqy (ORCPT ); Fri, 3 Aug 2018 15:46:54 -0400 Received: by mail-wm0-f68.google.com with SMTP id c14-v6so7106781wmb.4 for ; Fri, 03 Aug 2018 10:49:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=46jICNJiETn5zdqjL0cvnE2zLhUQSTYi+upiJKBmsPE=; b=ljVzwyNLtGRZ7bG3wrrNYSFKFKlJYY7tYfuZl1SD3mkdjEw8fVStnYujwVefEzguvL osgybAKfFgGKVk3IX1W9i2F0PEuFKKpG4giGAl641AwnGBoDlDcR5iLogL9MufeHWwDa yQKC+IGzW2zVTBm0AZ7fneqY7nnYAoIdYhKHpCDVsLViTVJaGflW3lRkzsW/iIctna/5 ywi4+oY2QFDvh44tAI7AzxZC3ZjZhjiOs7jWz0yGn05oYT8v02bPYPpm/EKM9057BQDr SMjfgIs2W87yIZ/Tmapq3g437kws3pByujYMANOaiLXjWki/Ey0ZJ+g7YrCG4kQXeKA7 LRKQ== X-Gm-Message-State: AOUpUlFBtn1GnMbcXUW8sUVW7wrZ0TFYUAq61h+KYD2FRS8bQKlHtaAx 5ySjGdN4+F8AuVdygoAPmemJcG5kzFU= X-Google-Smtp-Source: AAOMgpeVws8JaTLfqcbqiyRAefklYClNUQ1hJaz3aesGY8mPTLcYQj6mRqr8ZjVYC3wab0Ep9+Jvbw== X-Received: by 2002:a1c:7d47:: with SMTP id y68-v6mr5314832wmc.62.1533318575080; Fri, 03 Aug 2018 10:49:35 -0700 (PDT) Received: from mcroce-redhat.redhat.com (host5-113-dynamic.33-79-r.retail.telecomitalia.it. [79.33.113.5]) by smtp.gmail.com with ESMTPSA id e133-v6sm8884249wma.33.2018.08.03.10.49.33 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 03 Aug 2018 10:49:34 -0700 (PDT) From: Matteo Croce To: netdev@vger.kernel.org, stephen@networkplumber.org Subject: [PATCH iproute2] ip link: don't stop batch processing Date: Fri, 3 Aug 2018 19:49:33 +0200 Message-Id: <20180803174933.24600-1-mcroce@redhat.com> X-Mailer: git-send-email 2.17.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When 'ip link show dev DEVICE' is processed in a batch mode, ip exits and stop processing further commands. This because ipaddr_list_flush_or_save() calls exit() to avoid printing the link information twice. Replace the exit with a classic goto out instruction. Signed-off-by: Matteo Croce --- ip/ipaddress.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ip/ipaddress.c b/ip/ipaddress.c index 6c306ab7..b7b78f6e 100644 --- a/ip/ipaddress.c +++ b/ip/ipaddress.c @@ -1920,7 +1920,7 @@ static int ipaddr_list_flush_or_save(int argc, char **argv, int action) exit(1); } delete_json_obj(); - exit(0); + goto out; } if (filter.family != AF_PACKET) {