From patchwork Sat Jul 20 16:30:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Sutter X-Patchwork-Id: 1134399 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.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=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=nwl.cc Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 45rYJk5rfMz9sNC for ; Sun, 21 Jul 2019 02:30:46 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726320AbfGTQaq (ORCPT ); Sat, 20 Jul 2019 12:30:46 -0400 Received: from orbyte.nwl.cc ([151.80.46.58]:40886 "EHLO orbyte.nwl.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726300AbfGTQaq (ORCPT ); Sat, 20 Jul 2019 12:30:46 -0400 Received: from localhost ([::1]:53976 helo=tatos) by orbyte.nwl.cc with esmtp (Exim 4.91) (envelope-from ) id 1hosFx-0005Rx-B9; Sat, 20 Jul 2019 18:30:45 +0200 From: Phil Sutter To: Pablo Neira Ayuso Cc: netfilter-devel@vger.kernel.org Subject: [iptables PATCH 03/12] xtables-save: Use argv[0] as program name Date: Sat, 20 Jul 2019 18:30:17 +0200 Message-Id: <20190720163026.15410-4-phil@nwl.cc> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190720163026.15410-1-phil@nwl.cc> References: <20190720163026.15410-1-phil@nwl.cc> MIME-Version: 1.0 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Don't hard-code program names. This also fixes for bogus 'xtables-save' name which is no longer used. Signed-off-by: Phil Sutter --- iptables/xtables-save.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/iptables/xtables-save.c b/iptables/xtables-save.c index 3f389e8fdc234..491122f39bbb0 100644 --- a/iptables/xtables-save.c +++ b/iptables/xtables-save.c @@ -9,6 +9,7 @@ #include "config.h" #include #include +#include #include #include #include @@ -80,8 +81,8 @@ __do_output(struct nft_handle *h, const char *tablename, bool counters) time_t now = time(NULL); - printf("# Generated by xtables-save v%s on %s", - PACKAGE_VERSION, ctime(&now)); + printf("# Generated by %s v%s on %s", prog_name, + prog_vers, ctime(&now)); printf("*%s\n", tablename); /* Dump out chain names first, @@ -122,7 +123,7 @@ do_output(struct nft_handle *h, const char *tablename, bool counters) * rule */ static int -xtables_save_main(int family, const char *progname, int argc, char *argv[]) +xtables_save_main(int family, int argc, char *argv[]) { const struct builtin_table *tables; const char *tablename = NULL; @@ -133,7 +134,7 @@ xtables_save_main(int family, const char *progname, int argc, char *argv[]) FILE *file = NULL; int ret, c; - xtables_globals.program_name = progname; + xtables_globals.program_name = basename(*argv);; c = xtables_init_all(&xtables_globals, family); if (c < 0) { fprintf(stderr, "%s/%s Failed to initialize xtables\n", @@ -237,12 +238,12 @@ xtables_save_main(int family, const char *progname, int argc, char *argv[]) int xtables_ip4_save_main(int argc, char *argv[]) { - return xtables_save_main(NFPROTO_IPV4, "iptables-save", argc, argv); + return xtables_save_main(NFPROTO_IPV4, argc, argv); } int xtables_ip6_save_main(int argc, char *argv[]) { - return xtables_save_main(NFPROTO_IPV6, "ip6tables-save", argc, argv); + return xtables_save_main(NFPROTO_IPV6, argc, argv); } static int __ebt_save(struct nft_handle *h, const char *tablename, bool counters) @@ -266,8 +267,8 @@ static int __ebt_save(struct nft_handle *h, const char *tablename, bool counters if (first) { now = time(NULL); - printf("# Generated by ebtables-save v%s on %s", - PACKAGE_VERSION, ctime(&now)); + printf("# Generated by %s v%s on %s", prog_name, + prog_vers, ctime(&now)); first = false; } printf("*%s\n", tablename); @@ -308,7 +309,7 @@ int xtables_eb_save_main(int argc_, char *argv_[]) } } - xtables_globals.program_name = "ebtables-save"; + xtables_globals.program_name = basename(*argv_); c = xtables_init_all(&xtables_globals, h.family); if (c < 0) { fprintf(stderr, "%s/%s Failed to initialize xtables\n", @@ -362,7 +363,7 @@ int xtables_arp_save_main(int argc, char **argv) }; int c; - xtables_globals.program_name = "arptables-save"; + xtables_globals.program_name = basename(*argv);; c = xtables_init_all(&xtables_globals, h.family); if (c < 0) { fprintf(stderr, "%s/%s Failed to initialize xtables\n",