From aeae9d1789ac1da554df20bdf6734861d6c249c4 Mon Sep 17 00:00:00 2001
From: Michael Mikonos <127171689+mknos@users.noreply.github.com>
Date: Fri, 4 Oct 2024 21:35:27 +0800
Subject: [PATCH] what: exit(0) only for match

* Similar to grep command, exit code 0 means at least one match occurred when looking at input files
* Unlike grep, exit code 1 is shared between no-match and error conditions (e.g. file could not be opened) [1]
* Continue to bail on the 1st open() failure, but now go through exit() instead of die()
* Difference discovered when testing against OpenBSD version

1. https://pubs.opengroup.org/onlinepubs/009696799/utilities/what.html
---
 bin/what | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/bin/what b/bin/what
index e4f6c658..0d15daf0 100755
--- a/bin/what
+++ b/bin/what
@@ -15,16 +15,22 @@ use strict;
 
 use Getopt::Std qw(getopts);
 
+my $matches = 0;
 my %opt;
 getopts('s', \%opt) or usage();
 @ARGV or usage();
 
 for my $file (@ARGV)
     {
-        open(FILE, '<', $file) or die "Unable to read $file: $!";
-        printWhat(\*FILE, $file, $opt{'s'});
-        close FILE;
+        my $fh;
+        unless (open $fh, '<', $file) {
+            warn "Unable to open '$file': $!\n";
+            last;
+        }
+        printWhat($fh, $file, $opt{'s'});
+        close $fh;
     }
+exit ($matches ? 0 : 1);
 
 #### read open file and print "what" statements...
 #### pass in file handle, file name, and whether to stop printing after 1st "what"
@@ -38,6 +44,7 @@ sub printWhat
     while (defined($line = <$file_handle>))
     {
         next unless $line =~ m/\@\(#\)/;
+        $matches++;
 
         if ($line =~ m/\0/) ## there may be more than 1 in here
         {
@@ -68,8 +75,6 @@ sub usage {
     Pod::Usage::pod2usage({ -exitval => 1, -verbose => 0 });
 }
 
-exit;
-
 __END__
 
 =pod
@@ -95,6 +100,11 @@ pattern in your file and you are set.
 
 B<->B<s> Stop after the first occurrence of the pattern.
 
+=head1 EXIT STATUS
+
+The what utility exits with status of 0 if any version information was found,
+or with a status of 1 otherwise.
+
 =head1 ENVIRONMENT
 
 The working of B<what> is not influenced by any environment variables.