package Config;
use strict;
-# use warnings; Pulls in Carp
-# use vars pulls in Carp
+use warnings;
+use vars '%Config';
sub bincompat_options {
- return sort split ' ', (Internals::V())[0];
+ return split ' ', (Internals::V())[0];
}
sub non_bincompat_options {
- return sort split ' ', (Internals::V())[1];
+ return split ' ', (Internals::V())[1];
}
sub compile_date {
print " $date\n" if defined $date;
my @env = map { "$_=\"$ENV{$_}\"" } sort grep {/^PERL/} keys %ENV;
- push @env, "CYGWIN=\"$ENV{CYGWIN}\"" if $^O eq 'cygwin';
+ push @env, "CYGWIN=\"$ENV{CYGWIN}\"" if $^O eq 'cygwin' and $ENV{CYGWIN};
if (@env) {
print " \%ENV:\n";
$heavy_txt .= $header_files . "\n}\n\n";
my $export_funcs = <<'EOT';
-my %Export_Cache = (myconfig => 1,
- config_sh => 1, config_vars => 1, config_re => 1,
+my %Export_Cache = (myconfig => 1, config_sh => 1, config_vars => 1,
+ config_re => 1, compile_date => 1, local_patches => 1,
bincompat_options => 1, non_bincompat_options => 1,
- compile_date => 1, local_patches => 1,
header_files => 1);
EOT
package Config;
use strict;
-# use warnings; Pulls in Carp
-# use vars pulls in Carp
+use warnings;
+use vars '%%Config';
# Skip @Config::EXPORT because it only contains %%Config, which we special
# case below as it's not a function. @Config::EXPORT won't change in the
my $myver = sprintf "%vd", $^V;
$config_txt .= sprintf <<'ENDOFBEG', ($myver) x 3;
-our %%Config;
# Define our own import method to avoid pulling in the full Exporter:
sub import {
my @v_others = ();
my $in_v = 0;
my %Data = ();
+my $quote;
my %seen_quotes;
push(@non_v, "#$_"); # not a name='value' line
next;
}
- my $quote = $2;
if ($in_v) {
$val .= $_;
}
else {
+ $quote = $2;
($name,$val) = ($1,$3);
}
$in_v = $val !~ /$quote\n/;
my $byteorder_code;
if ($s == 4 || $s == 8) {
- my $list = join ',', reverse(2..$s);
+ my $list = join ',', reverse(1..$s-1);
my $format = 'a'x$s;
$byteorder_code = <<"EOT";
-my \$i = 0;
-foreach my \$c ($list) { \$i |= ord(\$c); \$i <<= 8 }
-\$i |= ord(1);
+my \$i = ord($s);
+foreach my \$c ($list) { \$i <<= 8; \$i |= ord(\$c); }
our \$byteorder = join('', unpack('$format', pack('$f', \$i)));
EOT
} else {
my($self, $key) = @_;
# check for cached value (which may be undef so we use exists not defined)
- return $self->{$key} if exists $self->{$key};
-
- return $self->fetch_string($key);
+ return exists $self->{$key} ? $self->{$key} : $self->fetch_string($key);
}
+
ENDOFEND
$heavy_txt .= <<'ENDOFEND';
}
sub STORE { die "\%Config::Config is read-only\n" }
-*DELETE = \&STORE;
-*CLEAR = \&STORE;
-
+*DELETE = *CLEAR = \*STORE; # Typeglob aliasing uses less space
sub config_sh {
substr $Config_SH_expanded, 1, $config_sh_len;
=item myconfig()
Returns a textual summary of the major perl configuration values.
-See also C<-V> in L<perlrun/Switches>.
+See also C<-V> in L<perlrun/Command Switches>.
=item config_sh()
name='value';
Names which are unknown are output as C<name='UNKNOWN';>.
-See also C<-V:name> in L<perlrun/Switches>.
+See also C<-V:name> in L<perlrun/Command Switches>.
=item bincompat_options()