From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 20 Jun 2020 11:45:37 +0000 (+0100)
Subject: nailing-cargo: Move arg parsing into a subroutine
X-Git-Tag: nailing-cargo/1.0.0~130
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=9068ecccc8d2b22ba1c8778de547baa886ff3b4f;p=nailing-cargo.git

nailing-cargo: Move arg parsing into a subroutine

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/nailing-cargo b/nailing-cargo
index e825936..73f72a2 100755
--- a/nailing-cargo
+++ b/nailing-cargo
@@ -642,50 +642,53 @@ sub uninstall () {
   unaltcargolock(0);
 }
 
-while (@ARGV && $ARGV[0] =~ m/^-/) {
-  $_ = shift @ARGV;
-  last if m{^--$};
-  if (m{^-[^-]}) {
-    while (m{^-.}) {
-      if (s{^-v}{-}) {
-	$verbose++;
-      } elsif (s{^-q}{-}) {
-	$verbose=0;
-      } elsif (s{^-n}{-}) {
-	$noact++;
-      } elsif (s{^-D}{-}) {
-	$dump++;
-      } elsif (s{^-A(.+)}{-}s) {
-	$target = $1;
-      } elsif (s{^-([uU])}{-}) {
-	$cargo_lock_update= $1=~m/[a-z]/;
-      } elsif (s{^-([mM])}{-}) {
-	$cargo_manifest_args= $1=~m/[a-z]/;
-      } elsif (s{^-([tT])}{-}) {
-	$cargo_target_arg= $1=~m/[a-z]/;
-      } elsif (s{^-([oO])}{-}) {
-	$online= $1=~m/[a-z]/;
-      } else {
-	die "$self: unknown short option(s) $_\n";
+sub parse_args () {
+  while (@ARGV && $ARGV[0] =~ m/^-/) {
+    $_ = shift @ARGV;
+    last if m{^--$};
+    if (m{^-[^-]}) {
+      while (m{^-.}) {
+	if (s{^-v}{-}) {
+	  $verbose++;
+	} elsif (s{^-q}{-}) {
+	  $verbose=0;
+	} elsif (s{^-n}{-}) {
+	  $noact++;
+	} elsif (s{^-D}{-}) {
+	  $dump++;
+	} elsif (s{^-A(.+)}{-}s) {
+	  $target = $1;
+	} elsif (s{^-([uU])}{-}) {
+	  $cargo_lock_update= $1=~m/[a-z]/;
+	} elsif (s{^-([mM])}{-}) {
+	  $cargo_manifest_args= $1=~m/[a-z]/;
+	} elsif (s{^-([tT])}{-}) {
+	  $cargo_target_arg= $1=~m/[a-z]/;
+	} elsif (s{^-([oO])}{-}) {
+	  $online= $1=~m/[a-z]/;
+	} else {
+	  die "$self: unknown short option(s) $_\n";
+	}
       }
+    } elsif (s{^--(?:target|arch)=}{}) {
+      $target = $_;
+    } elsif (m{^--(no-)?cargo-lock-update}) {
+      $cargo_lock_update= !!$1;
+    } elsif (m{^--(no-)?cargo-manifest-args}) {
+      $cargo_manifest_args= !!$1;
+    } elsif (m{^--(no-)?cargo-target-dir-arg}) {
+      $cargo_target_arg= !!$1;
+    } elsif (m{^--(on|off)line$}) {
+      $online = $1 eq 'on';
+    } else {
+      die "$self: unknown long option $_\n";
     }
-  } elsif (s{^--(?:target|arch)=}{}) {
-    $target = $_;
-  } elsif (m{^--(no-)?cargo-lock-update}) {
-    $cargo_lock_update= !!$1;
-  } elsif (m{^--(no-)?cargo-manifest-args}) {
-    $cargo_manifest_args= !!$1;
-  } elsif (m{^--(no-)?cargo-target-dir-arg}) {
-    $cargo_target_arg= !!$1;
-  } elsif (m{^--(on|off)line$}) {
-    $online = $1 eq 'on';
-  } else {
-    die "$self: unknown long option $_\n";
   }
-}
 
-die "$self: need command to run\n" unless @ARGV || $noact;
+  die "$self: need command to run\n" unless @ARGV || $noact;
+}
 
+parse_args();
 loadconfigs();
 takelock();
 readnail();