From 9f3222244a671153bc99e7529b8505f40eebc21d Mon Sep 17 00:00:00 2001
From: Michael Mikonos <127171689+mknos@users.noreply.github.com>
Date: Thu, 3 Oct 2024 13:42:32 +0800
Subject: [PATCH] par: reject bad options

* Change par to raise a fatal error if invalid options are passed, e.g. "perl par -X"
* Change the order or ARGV check to after getopts() call, so that an option is not counted incorrectly as a file argument, e.g. "perl par -S"
---
 bin/par | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/bin/par b/bin/par
index a7b56d0f..d5b9b1dc 100755
--- a/bin/par
+++ b/bin/par
@@ -20,6 +20,7 @@ my $VERSION = '0.08';
 
 use File::Find;
 use File::Basename;
+use Getopt::Std qw(getopts);
 use Cwd;
 
 eval 'use Stat::lsMode';
@@ -35,21 +36,13 @@ binmode STDOUT;
 # Are we 'par' or 'shar'?
 ($0) = $0 =~ /(\w+)$/;
 
-# Check for arguments.
-@ARGV or die "usage: $0 [-s submitter] [-STBqvz] file [files...]\n";
+sub usage {
+    die "usage: $0 [-s submitter] [-STBqvz] file...\n";
+}
 
-# Get options.
 my %opts;
-while (@ARGV && $ARGV[0] =~ s/^-//) {
-    local $_ = shift;
-    while (/([sSTBVqvz])/g) {
-        if ($1 eq 's') {
-            $opts{'s'} = /\G(.*)/g && $1 ? $1 : shift;
-        } else {
-            $opts{$1}++;
-        }
-    }
-}
+getopts('s:STBqvz', \%opts) or usage();
+@ARGV or usage();
 
 # Print version.
 if ($opts{'v'}) {