From patchwork Mon Mar 6 03:27:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Modra X-Patchwork-Id: 64411 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1638438wrd; Sun, 5 Mar 2023 19:27:57 -0800 (PST) X-Google-Smtp-Source: AK7set84P7TDzv6sCSBFc/71kDnGj3Fbwtqj5wnLSyLzL7dn8bvLoPkqxu0A59lzSTOLk8iRY2G4 X-Received: by 2002:a17:906:3b92:b0:8d6:ed70:991b with SMTP id u18-20020a1709063b9200b008d6ed70991bmr12885982ejf.15.1678073277787; Sun, 05 Mar 2023 19:27:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678073277; cv=none; d=google.com; s=arc-20160816; b=BxQ5KFo7lACSs81beZV/cpDCbGe2P2JvwrUbF0IXpdPvcidU+mFHU2wLm063KriuxC 8rpvt+xrBUALWcGyfzdRe9Rn5WPpuHetByDq9p16fkI6m05VJZ9xHGERHabBzKVO4Tbx Eu+mRHjx78eD+Q0Ag73tFBaHBO9oLrkIijeKg4MF9/a/CGsYWr4uHtlyQTo3dj5lhO9I 9qWVBbNQ4ID1DIgnTSlYzFFc4HoLYpzezTsdIw0YmbFRSefXFmCurHXw/ZAvKW/IL4K4 CUVTnClYzl2xqBNitcEWJBjiSEiXwsJ5SsrhEFaapyX0ZN8v4amENOWQnDRtB7pDjOdU B+7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-disposition:mime-version:message-id:subject:to:date :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=CAFaHCgM2oEPMYN78AawzCnIN9+Pp8JogytAEsatp7k=; b=Ona9EHEYSviUuerSJCNouyzKm4JfnRvFcZ2ndKjn0YW54el+/WfKE85uciFnF+EI39 3w/KC97Qo2zQsC8b3nl5vB124nLFlfLrCvT7dN8QJjqeBICwjtFVzPjiDSgSANkB13vk QNzvppT6Dnusn7ujXITnIA/zgTyBaxTechcsbAQJwr/lgkKdbibKeWoN02Dpzq8t36un 9/ZkDWnxUEd3Rm0YwtARMJTuEFEMGUXoDDY0mj1kybuuK8nVSB0y9m0OK7uZfjkXy/Jx mi1lnvI9bRLtz7d9Lk26c7tPoc7Cl98t64jbiboMUEjw5zrTyVasJcUQ4lqp/ztkMz9L laXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=cftlB4Ya; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id sa10-20020a1709076d0a00b008ce81ce3521si7974906ejc.334.2023.03.05.19.27.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Mar 2023 19:27:57 -0800 (PST) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=cftlB4Ya; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C21F03857B9B for ; Mon, 6 Mar 2023 03:27:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C21F03857B9B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1678073276; bh=CAFaHCgM2oEPMYN78AawzCnIN9+Pp8JogytAEsatp7k=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=cftlB4Ya2tEK89ArlHFCBrs3kqIV1UqiLt3D71jdlJ1nyt3IoqGmlJ9EGNZ+osjpT FtFi/TKgUwvpT/2fk4W8eyZnEg/kYdlYoKy+XgGgm42SAoQmNB2n/bsB1T20hB7TlC AJmEGiNkF/Spkv/mB0b4LeKPmf6txXgK9l2oHaR4= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-pj1-x1036.google.com (mail-pj1-x1036.google.com [IPv6:2607:f8b0:4864:20::1036]) by sourceware.org (Postfix) with ESMTPS id 730673858D28 for ; Mon, 6 Mar 2023 03:27:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 730673858D28 Received: by mail-pj1-x1036.google.com with SMTP id cp7-20020a17090afb8700b0023756229427so11847578pjb.1 for ; Sun, 05 Mar 2023 19:27:48 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678073267; h=content-disposition:mime-version:message-id:subject:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=CAFaHCgM2oEPMYN78AawzCnIN9+Pp8JogytAEsatp7k=; b=KEjb/dnio+A+fb+JBM5M3YbebZZ+G/cKesxO+r6w9yScLLZo9BeOWQA5WYvLwBzLWV LzVjlfElg7K6jxuVC1weDN8jy1romnzwwW2Pbf0QwQfGFr3KHF+0GnEfnH716jtYkNrJ QvaP/5dUJPmPbclEeRw7rwDsL1OpnoH+mALXHVJJB4YAHzD7jyR5EaTTlXgCS98/UREx ZpYo/pSe+l0gYYi+kfESYTeRYqhh+FyyGX2S8gfYDUm8Xmn4rX6zFNGtGMSdvoKOgwXQ eI1Xtb5ixolGtRcMZGemoUhRZlFcUIEuy7j0X9tBUlZplxaUwsWS9Qy10osF3ZD3IkXP OvUw== X-Gm-Message-State: AO0yUKUGXER8zCFhT9/UXu/kSXO0NVXZctNBvGQW269PScEbDB6X99Ip d5KLveeNvNAU5IiiYauzkMhtHCBwjso= X-Received: by 2002:a17:902:da87:b0:199:3a4a:d702 with SMTP id j7-20020a170902da8700b001993a4ad702mr13659448plx.0.1678073267226; Sun, 05 Mar 2023 19:27:47 -0800 (PST) Received: from squeak.grove.modra.org (158.106.96.58.static.exetel.com.au. [58.96.106.158]) by smtp.gmail.com with ESMTPSA id lh3-20020a170903290300b0019a91895cdfsm5451310plb.50.2023.03.05.19.27.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Mar 2023 19:27:46 -0800 (PST) Received: by squeak.grove.modra.org (Postfix, from userid 1000) id 62F031140761; Mon, 6 Mar 2023 13:57:44 +1030 (ACDT) Date: Mon, 6 Mar 2023 13:57:44 +1030 To: binutils@sourceware.org Subject: Correct objdump command line error handling Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-3035.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Alan Modra via Binutils From: Alan Modra Reply-To: Alan Modra Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759587364996394442?= X-GMAIL-MSGID: =?utf-8?q?1759587364996394442?= bfd_nonfatal is used when a bfd error is to be printed. That's not the case for command line errors. * objdump.c (nonfatal): Rename to my_bfd_nonfatal. (main): Use non_fatal and call usage on unrecognized arg errors. Don't set exit_status when calling usage. diff --git a/binutils/objdump.c b/binutils/objdump.c index d00eed054c4..c895221c679 100644 --- a/binutils/objdump.c +++ b/binutils/objdump.c @@ -558,7 +558,7 @@ static struct option long_options[]= }; static void -nonfatal (const char *msg) +my_bfd_nonfatal (const char *msg) { bfd_nonfatal (msg); exit_status = 1; @@ -5701,14 +5701,14 @@ display_object_bfd (bfd *abfd) if (bfd_get_error () == bfd_error_file_ambiguously_recognized) { - nonfatal (bfd_get_filename (abfd)); + my_bfd_nonfatal (bfd_get_filename (abfd)); list_matching_formats (matching); return; } if (bfd_get_error () != bfd_error_file_not_recognized) { - nonfatal (bfd_get_filename (abfd)); + my_bfd_nonfatal (bfd_get_filename (abfd)); return; } @@ -5718,7 +5718,7 @@ display_object_bfd (bfd *abfd) return; } - nonfatal (bfd_get_filename (abfd)); + my_bfd_nonfatal (bfd_get_filename (abfd)); if (bfd_get_error () == bfd_error_file_ambiguously_recognized) list_matching_formats (matching); @@ -5758,7 +5758,7 @@ display_any_bfd (bfd *file, int level) if (arfile == NULL) { if (bfd_get_error () != bfd_error_no_more_archived_files) - nonfatal (bfd_get_filename (file)); + my_bfd_nonfatal (bfd_get_filename (file)); break; } @@ -5798,7 +5798,7 @@ display_file (char *filename, char *target, bool last_file) file = bfd_openr (filename, target); if (file == NULL) { - nonfatal (filename); + my_bfd_nonfatal (filename); return; } @@ -5951,7 +5951,10 @@ main (int argc, char **argv) else if (streq (optarg, "off")) visualize_jumps = false; else - nonfatal (_("unrecognized argument to --visualize-option")); + { + non_fatal (_("unrecognized argument to --visualize-option")); + usage (stderr, 1); + } } break; case OPTION_DISASSEMBLER_COLOR: @@ -5968,7 +5971,10 @@ main (int argc, char **argv) || streq (optarg, "extended-colour")) disassembler_color = extended; else - nonfatal (_("unrecognized argument to --disassembler-color")); + { + non_fatal (_("unrecognized argument to --disassembler-color")); + usage (stderr, 1); + } break; case 'E': if (strcmp (optarg, "B") == 0) @@ -5977,7 +5983,7 @@ main (int argc, char **argv) endian = BFD_ENDIAN_LITTLE; else { - nonfatal (_("unrecognized -E option")); + non_fatal (_("unrecognized -E option")); usage (stderr, 1); } break; @@ -5989,7 +5995,6 @@ main (int argc, char **argv) else { non_fatal (_("unrecognized --endian type `%s'"), optarg); - exit_status = 1; usage (stderr, 1); } break;