From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-pj1-x1036.google.com with SMTP id cp7-20020a17090afb8700b0023756229427so11847578pjb.1 for ; Sun, 05 Mar 2023 19:27:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678073267; h=content-disposition:mime-version:message-id:subject:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=CAFaHCgM2oEPMYN78AawzCnIN9+Pp8JogytAEsatp7k=; b=fYmp0S8YQoR5a6tIc6ODXUclKnwtdFzyEwTxAiuTID5y+JOryGKTxCDDMBWrV+y75o Kp22zomt6n5CAFvpsURIACf8VvvMLKAJPNx6hVzR5GbtIIdK49jT7U4f+qfK98LZcaxm j8LajHL+5Nbah5/nMHvUqCxV0poT1RGFcgcdfjte57G7BtQLo9ed9RVAfvRnzhhpSamm xsP5A/oAi6QMaThiiMoNmkWNL8L3/nQLL1Jcanxgs/ikhd06/OiVuDoHeIlV1+hd8yrk K6Mry0OifnESw6Dhe1BtsZDIqVc9nlsXmNkSfSJlDtb0/2d1m5s9fFOdz181zfUTccbe uN0Q== 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-Google-Smtp-Source: AK7set/herMYgVXJWPltOojZqm9fWV7OqyLydvLFx3ZTDEl0J4DjM3NdxDlpHIUe7eSWzANxXI5r8A== 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 From: Alan Modra To: binutils@sourceware.org Subject: Correct objdump command line error handling Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii 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 List-Id: 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; -- Alan Modra Australia Development Lab, IBM