nailing-cargo: Fix misuse of `cfg' and rename it

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

diff --git a/nailing-cargo b/nailing-cargo
index cfb97f3d8bc028d260fe6c3a8b1dbdc3bdc5498f..9496ebd02ffce1915a6b4dedd459c07c0fa21357 100755 (executable)
--- a/nailing-cargo
+++ b/nailing-cargo
@@ -170,7 +170,7 @@ sub cfg_uc {
   return $v;
 }
 
-sub cfg {
+sub cfge {
   my $exp = shift @_;
   my $v = cfg_uc @_;
   my $got = ref($v) || 'scalar';
@@ -181,14 +181,14 @@ sub cfg {
 
 sub cfgn {
   my $exp = shift @_;
-  (cfg $exp, @_) // badcfg @_, "missing";
+  (cfge $exp, @_) // badcfg @_, "missing";
 }
 
-sub cfgs  { cfg  'scalar', @_ }
+sub cfgs  { cfge 'scalar', @_ }
 sub cfgsn { cfgn 'scalar', @_ }
 
 sub cfgn_list {
-  my $l = cfg 'ARRAY', @_;
+  my $l = cfge 'ARRAY', @_;
   foreach my $x (@$l) {
     !ref $x or badcfg @_, "list contains non-scalar element";
   }
@@ -339,7 +339,7 @@ sub addargs () {
 
   if (defined $target) {
     if ($target =~ m{^[A-Z]}) {
-      $target = (cfg 'arch', $target) // $archmap{$target}
+      $target = (cfgs 'arch', $target) // $archmap{$target}
        // die "$self: --target=$target alias specified; not in cfg or map\n";
     }
     push @ARGV, "--target=$target";
@@ -374,7 +374,7 @@ END
     $pre  =~ s/^\s+//mg; $pre  =~ s/^\s+\n/ /g;
     $post =~ s/^\s+//mg; $post =~ s/^\s+\n/ /g;
   }
-  my $addpath = (cfg qw(oot path_add)) //
+  my $addpath = (cfg_uc qw(oot path_add)) //
     $use eq 'really' ? Types::Serialiser::true : Types::Serialiser::false;
   $addpath =
     !Types::Serialiser::is_bool $addpath ? $addpath           :