Drop sysexits.ph, _errprint, err, and errx. Use die in place of err

and errx, and exit(2) for invalid options.

diff --git a/minc b/minc
index 2f85227..1b5100f 100755 (executable)
--- a/minc
+++ b/minc
@@ -25,8 +25,6 @@ matching (m//) commands.
 use strict;
 use warnings;
 
-require 'sysexits.ph';
-
 use Data::Dumper;
 use Errno;
 use Fcntl qw(O_WRONLY O_EXCL O_CREAT);
@@ -97,14 +95,14 @@ our $opt_p;
 our $opt_s;                     # ;; # stupid cperl-mode
 
 if (not getopts('dfhnps')) {
-    exit(&EX_USAGE);
+    exit(2);
 }
 
 if ($opt_d) {
     $dumpfilters = 1;
 } elsif ($opt_h) {
     print("Sorry bub, no help.\n");
-    exit(&EX_OK);
+    exit;
 } elsif ($opt_n) {
     $run = 0;
 }
@@ -303,35 +301,6 @@ sub log_headers {
 ###############################################################################
 # Utility procedures
 
-sub _errprint {
-    printf(STDERR '%s:%s', __FILE__, __LINE__);
-
-    if (@_) {
-        print(STDERR ': ');
-        foreach (@_) {
-            print(STDERR);
-        }
-    }
-}
-
-sub err {
-    my $ex = shift;
-
-    _errprint(@_);
-    print(STDERR ": $!\n");
-
-    exit($ex);
-}
-
-sub errx {
-    my $ex = shift;
-
-    _errprint(@_);
-    print(STDERR "\n");
-
-    exit($ex);
-}
-
 sub mkfolder {
     my $mhfolder = shift;
     my $folder;
@@ -348,8 +317,7 @@ sub mkfolder {
                 if (-d $target or mkdir($target)) {
                     next;
                 } else {
-                    err(&EX_OSERR,
-                        "Failed to create +$mhfolder ($component)");
+                    die("Failed to create +$mhfolder ($component)");
                 }
             }
         }
@@ -361,7 +329,7 @@ sub getfiles {
     my @result;
 
     if (not opendir(DIR, $dir)) {
-        err(&EX_OSERR, "Failed opendir($dir)");
+        die("Failed opendir($dir)");
     }
 
     # Initialize $! to 0 (success) because stupid stupid Perl provides
@@ -376,7 +344,7 @@ sub getfiles {
       } readdir(DIR);
 
     if ($! != 0) {
-        err(&EX_OSERR, "Failed readdir($dir)");
+        die("Failed readdir($dir)");
     }
 
     if (scalar(@result) == 0) {
@@ -397,14 +365,14 @@ sub get_highest_msgnum {
 
     $dir = "$mh/$mhfolder";
     if (not opendir(DIR, $dir)) {
-        err(&EX_OSERR, "Failed opendir($dir)");
+        die("Failed opendir($dir)");
     }
 
     $! = 0;
     @list = readdir(DIR);
 
     if ($! != 0) {
-        err(&EX_OSERR, "Failed readdir($dir)");
+        die("Failed readdir($dir)");
     }
 
     closedir(DIR);
@@ -481,7 +449,7 @@ sub store_message {
         # This algorithm is different from the maildir one; let's make
         # 10 tries instead of 3.
         if ($try == 9) {
-            errx(&EX_TEMPFAIL, "Attempted filename $mhmsg exists.");
+            die("Attempted filename $mhmsg exists.");
         }
 
         # This algorithm is different; i don't think we need to sleep.
@@ -494,7 +462,7 @@ sub store_message {
 
     if ($run) {
         if (not rename($msg, $mhmsg)) {
-            err(&EX_OSERR, "Failed rename($msg, $mhmsg)");
+            die("Failed rename($msg, $mhmsg)");
         }
 
         # Mark each message as soon as we store it and bomb if that
@@ -505,9 +473,9 @@ sub store_message {
             $status = system('mark', "+$mhfolder", "$msgnum", '-sequence',
                              'unseen', '-add');
             if (not WIFEXITED($status)) {
-                err(&EX_OSERR, "Failed to run mark");
+                die("Failed to run mark");
             } elsif (WEXITSTATUS($status) != 0) {
-                errx(&EX_SOFTWARE, "Failed to mark message unseen.");
+                die("Failed to mark message unseen.");
             }
         }
     }
@@ -692,7 +660,7 @@ MAIN: {
     if ($dumpfilters) {
         $Data::Dumper::Indent = 1;
         print(Dumper(\@FILTERS));
-        exit(&EX_OK);
+        exit;
     }
 
     @msglist = getfiles("$MAILDIR/new");