diff -uprN fml-4.0-stable-20040215_org/bin/archive.pl fml-4.0-stable-20040215/bin/archive.pl --- fml-4.0-stable-20040215_org/bin/archive.pl 2000-06-01 08:46:33.000000000 +0900 +++ fml-4.0-stable-20040215/bin/archive.pl 2025-03-22 09:20:22.697658270 +0900 @@ -20,8 +20,10 @@ push(@INC, $PWD) if -d $PWD; $DIR = $PWD; -require 'getopts.pl'; -&Getopts("dhu:A:UI:"); +#require 'getopts.pl'; +#&Getopts("dhu:A:UI:"); +use Getopt::Std; +getopts('dhu:A:UI:'); $opt_h && die(&Usage); diff -uprN fml-4.0-stable-20040215_org/bin/base64decode.pl fml-4.0-stable-20040215/bin/base64decode.pl --- fml-4.0-stable-20040215_org/bin/base64decode.pl 2001-09-24 22:45:05.000000000 +0900 +++ fml-4.0-stable-20040215/bin/base64decode.pl 2025-03-22 09:20:22.697658270 +0900 @@ -14,8 +14,10 @@ use vars qw($opt_d $opt_I $opt_o); -require 'getopts.pl'; -&Getopts("dI:o:"); +#require 'getopts.pl'; +#&Getopts("dI:o:"); +use Getopt::Std; +getopts('dI:o:'); undef $/; diff -uprN fml-4.0-stable-20040215_org/bin/base64encode.pl fml-4.0-stable-20040215/bin/base64encode.pl --- fml-4.0-stable-20040215_org/bin/base64encode.pl 1999-07-05 12:07:38.000000000 +0900 +++ fml-4.0-stable-20040215/bin/base64encode.pl 2025-03-22 09:20:22.697658270 +0900 @@ -12,8 +12,10 @@ # $Id: base64encode.pl,v 1.2 1999/07/05 03:07:38 fukachan Exp $ # -require 'getopts.pl'; -&Getopts("dI:"); +#require 'getopts.pl'; +#&Getopts("dI:"); +use Getopt::Std; +getopts('dI:'); $libdir = $0; $libdir =~ s/base64encode.pl//; diff -uprN fml-4.0-stable-20040215_org/bin/cksum.pl fml-4.0-stable-20040215/bin/cksum.pl --- fml-4.0-stable-20040215_org/bin/cksum.pl 2000-07-18 22:34:57.000000000 +0900 +++ fml-4.0-stable-20040215/bin/cksum.pl 2025-03-22 09:20:22.697658270 +0900 @@ -12,8 +12,10 @@ ############################################ # getopt() -require 'getopts.pl'; -&Getopts("dh"); +#require 'getopts.pl'; +#&Getopts("dh"); +use Getopt::Std; +getopts('dh'); for my $f (@ARGV) { my ($crc, $total) = &TraditionalATTUnixCheckSum($f); diff -uprN fml-4.0-stable-20040215_org/bin/daily.pl fml-4.0-stable-20040215/bin/daily.pl --- fml-4.0-stable-20040215_org/bin/daily.pl 2000-06-11 14:01:20.000000000 +0900 +++ fml-4.0-stable-20040215/bin/daily.pl 2025-03-22 09:20:22.699658148 +0900 @@ -33,8 +33,10 @@ sub Init $| = 1; - require 'getopts.pl'; - &Getopts("f:dhp:t:"); + #require 'getopts.pl'; + #&Getopts("f:dhp:t:"); + use Getopt::Std; + getopts('f:dhp:t:'); # help if ($opt_h) { &Usage; exit 0;} diff -uprN fml-4.0-stable-20040215_org/bin/emumail.pl fml-4.0-stable-20040215/bin/emumail.pl --- fml-4.0-stable-20040215_org/bin/emumail.pl 2003-12-17 23:45:22.000000000 +0900 +++ fml-4.0-stable-20040215/bin/emumail.pl 2025-03-22 09:20:22.700658087 +0900 @@ -85,8 +85,10 @@ $_; sub Init { - require 'getopts.pl'; - &Getopts("dhg:f:s:t:hHrR:B:M:"); + #require 'getopts.pl'; + #&Getopts("dhg:f:s:t:hHrR:B:M:"); + use Getopt::Std; + getopts('dhg:f:s:t:hHrR:B:M:'); $USER = $ENV{'USER'} || (getpwuid($<))[0]; $Gecos = (getpwuid($<))[6] || $USER; diff -uprN fml-4.0-stable-20040215_org/bin/expire.pl fml-4.0-stable-20040215/bin/expire.pl --- fml-4.0-stable-20040215_org/bin/expire.pl 2000-09-10 12:38:12.000000000 +0900 +++ fml-4.0-stable-20040215/bin/expire.pl 2025-03-22 09:20:22.700658087 +0900 @@ -17,8 +17,10 @@ $SPOOL_DIR = $SPOOL_DIR || "spool"; # ex $Expire = $Expire || 7; # days (7 == one week) if ($0 eq __FILE__) { - require 'getopts.pl'; - &Getopts("hs:e:dn"); + #require 'getopts.pl'; + #&Getopts("hs:e:dn"); + use Getopt::Std; + getopts('hs:e:dn'); die(&USAGE) if $opt_h; $SPOOL_DIR = $opt_s || $SPOOL_DIR; diff -uprN fml-4.0-stable-20040215_org/bin/fwix.pl fml-4.0-stable-20040215/bin/fwix.pl --- fml-4.0-stable-20040215_org/bin/fwix.pl 2003-12-17 23:45:22.000000000 +0900 +++ fml-4.0-stable-20040215/bin/fwix.pl 2025-03-22 09:20:22.704657842 +0900 @@ -14,8 +14,10 @@ unshift(@ARGV, split(/\s+/, $ENV{'FWIX_OPTS'})); -require 'getopts.pl'; -&Getopts("f:i:hd:b:m:M:t:vT:D:I:A:C:R:N:n:L:S:Z:Fo:"); +#require 'getopts.pl'; +#&Getopts("f:i:hd:b:m:M:t:vT:D:I:A:C:R:N:n:L:S:Z:Fo:"); +use Getopt::Std; +getopts('f:i:hd:b:m:M:t:vT:D:I:A:C:R:N:n:L:S:Z:Fo:'); my $out_jcode = 'euc'; diff -uprN fml-4.0-stable-20040215_org/bin/gen_summary.pl fml-4.0-stable-20040215/bin/gen_summary.pl --- fml-4.0-stable-20040215_org/bin/gen_summary.pl 2003-12-17 23:45:22.000000000 +0900 +++ fml-4.0-stable-20040215/bin/gen_summary.pl 2025-03-22 09:20:22.704657842 +0900 @@ -16,8 +16,10 @@ $rcsid = q$Id: gen_summary.pl,v 2.5.2. ###################################################################### -require 'getopts.pl'; -&Getopts("d:f:ht:I:D:vVTHM:L:o:mB"); +#require 'getopts.pl'; +#&Getopts("d:f:ht:I:D:vVTHM:L:o:mB"); +use Getopt::Std; +getopts(':f:ht:I:D:vVTHM:L:o:mB'); eval(' chop ($PWD = `pwd`); '); $PWD = $ENV{'PWD'} || $PWD || '.'; # '.' is the last resort;) diff -uprN fml-4.0-stable-20040215_org/bin/more_secure_cf.pl fml-4.0-stable-20040215/bin/more_secure_cf.pl --- fml-4.0-stable-20040215_org/bin/more_secure_cf.pl 2000-10-15 17:11:08.000000000 +0900 +++ fml-4.0-stable-20040215/bin/more_secure_cf.pl 2025-03-22 09:20:22.705657781 +0900 @@ -12,8 +12,10 @@ # $Id: more_secure_cf.pl,v 1.6 2000/10/15 08:11:08 fukachan Exp $ # -require 'getopts.pl'; -&Getopts("df:c:"); +#require 'getopts.pl'; +#&Getopts("df:c:"); +use Getopt::Std; +getopts('df:c:'); $DIR = $0; $DIR =~ s#(.*/).*$#$1#; diff -uprN fml-4.0-stable-20040215_org/bin/passwd.pl fml-4.0-stable-20040215/bin/passwd.pl --- fml-4.0-stable-20040215_org/bin/passwd.pl 2000-01-05 23:28:37.000000000 +0900 +++ fml-4.0-stable-20040215/bin/passwd.pl 2025-03-22 09:20:22.705657781 +0900 @@ -14,8 +14,10 @@ $rcsid = q$Id: passwd.pl,v 2.2 2000/01 ($rcsid) = ($rcsid =~ /Id: (\S+).pl,v\s+(\S+)\s+/ && "$1[$2]"); $rcsid .= 'Current'; -require 'getopts.pl'; -&Getopts("p:hdiI:"); +#require 'getopts.pl'; +#&Getopts("p:hdiI:"); +use Getopt::Std; +getopts('p:hdiI:'); $opt_h && die(&Usage); @ARGV || die(&Usage); diff -uprN fml-4.0-stable-20040215_org/bin/pmail.pl fml-4.0-stable-20040215/bin/pmail.pl --- fml-4.0-stable-20040215_org/bin/pmail.pl 2000-04-01 11:22:53.000000000 +0900 +++ fml-4.0-stable-20040215/bin/pmail.pl 2025-03-22 09:20:22.706657720 +0900 @@ -42,8 +42,10 @@ sub Init &InitDNS; ### getopts() ### - require 'getopts.pl'; # Getopt - &Getopts('s:f:hvI:D:H:d'); + #require 'getopts.pl'; # Getopt + #&Getopts('s:f:hvI:D:H:d'); + use Getopt::Std; + getopts('s:f:hvI:D:H:d'); die(&USAGE) if $opt_h; # fix includes diff -uprN fml-4.0-stable-20040215_org/bin/resend.pl fml-4.0-stable-20040215/bin/resend.pl --- fml-4.0-stable-20040215_org/bin/resend.pl 2000-09-24 00:55:02.000000000 +0900 +++ fml-4.0-stable-20040215/bin/resend.pl 2025-03-22 09:20:22.706657720 +0900 @@ -14,8 +14,10 @@ push(@INC, $EXEC_DIR); push(@INC, $PWD) if -d $PWD; # getopt() -require 'getopts.pl'; -&Getopts("dhvD:"); +#require 'getopts.pl'; +#&Getopts("dhvD:"); +use Getopt::Std; +getopts('dhvD:'); $DIR = $opt_D || die("ERROR: require -D \$DIR\n"); $opt_h && &Usage; diff -uprN fml-4.0-stable-20040215_org/bin/translate.pl fml-4.0-stable-20040215/bin/translate.pl --- fml-4.0-stable-20040215_org/bin/translate.pl 1999-05-30 23:52:33.000000000 +0900 +++ fml-4.0-stable-20040215/bin/translate.pl 2025-03-22 09:20:22.708657597 +0900 @@ -13,8 +13,10 @@ # $Id: translate.pl,v 1.4 1999/05/30 14:52:33 fukachan Exp $ # -require 'getopts.pl'; -&Getopts("df:haM:L:"); +#require 'getopts.pl'; +#&Getopts("df:haM:L:"); +use Getopt::Std; +getopts('df:haM:L:'); $debug = $opt_d ? 1 : 0; $TRLIST = $opt_f || die("Please define -f translation-table-file\n"); diff -uprN fml-4.0-stable-20040215_org/cf/config fml-4.0-stable-20040215/cf/config --- fml-4.0-stable-20040215_org/cf/config 2003-01-16 03:07:38.000000000 +0900 +++ fml-4.0-stable-20040215/cf/config 2025-03-22 20:39:47.988817000 +0900 @@ -17,8 +17,10 @@ $ERROR_LOG = "etc/motd.error"; unlink $ERROR_LOG if -f $ERROR_LOG; -require 'getopts.pl'; -&Getopts("m:hdDr:csnfrFiI:v"); +#require 'getopts.pl'; +#&Getopts("m:hdDr:csnfrFiI:v"); +use Getopt::Std; +getopts('m:hdDr:csnfrFiI:v'); $no_dns = $opt_n; $debug = $opt_d; @@ -657,10 +659,12 @@ sub main'reverse if (defined $entry) { print STDERR "GO \$\t$key\n"; } - elsif (defined @entry) { +# elsif (defined @entry) { + elsif (@entry) { print STDERR "GO \@\t$key\n"; } - elsif (defined %entry) { +# elsif (defined %entry) { + elsif (%entry) { print STDERR "GO \%\t$key\n"; } elsif (defined &entry) { @@ -703,7 +707,8 @@ sub main'reverse next; } - if (defined @entry) { +# if (defined @entry) { + if (@entry) { undef $num; $OUT'LOCAL .= "\@$key = ("; foreach (@entry) { @@ -718,7 +723,8 @@ sub main'reverse # Is there an associative array that isn't the one # we're currently iterating through? - if ($key ne "_$package" && defined %entry) { +# if ($key ne "_$package" && defined %entry) { + if ($key ne "_$package" && %entry) { $OUT'LOCAL .= "\%$key = (\n"; #'; foreach $key (sort keys(%entry)) { $OUT'LOCAL .= "'$key', '". $entry{$key} ."',\n";#'; @@ -791,10 +797,12 @@ sub rv'PreScanConfigPH #'; if (defined $entry) { eval("$rv'\$$key = 1; undef $rv'\$$key"); } - elsif (defined @entry) { +# elsif (defined @entry) { + elsif (@entry) { eval("$rv'\@$key = 1; undef $rv'\@$key"); } - elsif ($key ne "_$package" && $key ne "_DB" && defined %entry) { +# elsif ($key ne "_$package" && $key ne "_DB" && defined %entry) { + elsif ($key ne "_$package" && $key ne "_DB" && %entry) { eval("$rv'\%$key = 1; undef $rv'\%$key"); } else { diff -uprN fml-4.0-stable-20040215_org/contrib/localhack/release-1/vote/vote.pl fml-4.0-stable-20040215/contrib/localhack/release-1/vote/vote.pl --- fml-4.0-stable-20040215_org/contrib/localhack/release-1/vote/vote.pl 2000-01-05 23:14:53.000000000 +0900 +++ fml-4.0-stable-20040215/contrib/localhack/release-1/vote/vote.pl 2025-03-20 13:13:21.282968095 +0900 @@ -12,8 +12,10 @@ $ENV{'SHELL'} = '/bin/sh' if $ENV{'SHELL $ENV{'IFS'} = '' if $ENV{'IFS'} ne ''; ###### MAIN ##### -require 'getopts.pl'; -&Getopts('D:hdS:t'); +#require 'getopts.pl'; +#&Getopts('D:hdS:t'); +use Getopt::Std; +getopts('D:hdS:t'); $DIR = $opt_D ? $opt_D : $ENV{'PWD'}; $TODAY = 1 if $opt_t; die("USAGE: $0 -[DhdSt] files\n") if $opt_h; diff -uprN fml-4.0-stable-20040215_org/contrib/mail2fax/libfax.pl fml-4.0-stable-20040215/contrib/mail2fax/libfax.pl --- fml-4.0-stable-20040215_org/contrib/mail2fax/libfax.pl 2000-03-25 01:51:44.000000000 +0900 +++ fml-4.0-stable-20040215/contrib/mail2fax/libfax.pl 2025-03-20 08:05:41.749065354 +0900 @@ -13,8 +13,10 @@ if ($0 eq __FILE__) { - require 'getopts.pl'; - &Getopts("dr:f:h"); + #require 'getopts.pl'; + #&Getopts("dr:f:h"); + use Getopt::Std; + getopts('dr:f:h'); &InitSendFax; &SendFax(*e, $opt_r, $opt_f); diff -uprN fml-4.0-stable-20040215_org/contrib/mail2irc/libirc.pl fml-4.0-stable-20040215/contrib/mail2irc/libirc.pl --- fml-4.0-stable-20040215_org/contrib/mail2irc/libirc.pl 2000-04-01 11:22:54.000000000 +0900 +++ fml-4.0-stable-20040215/contrib/mail2irc/libirc.pl 2025-03-20 08:10:49.835030442 +0900 @@ -106,8 +106,10 @@ sub GetTime sub main'IrcParseArgv #' { ### getopts - require 'getopts.pl'; - &Getopts("df:I:t:hL:H:S"); + #require 'getopts.pl'; + #&Getopts("df:I:t:hL:H:S"); + use Getopt::Std; + getopts('df:I:t:hL:H:S'); if ($opt_h) { $s = $0; diff -uprN fml-4.0-stable-20040215_org/contrib/mail2pager/euc2jiskuten.pl fml-4.0-stable-20040215/contrib/mail2pager/euc2jiskuten.pl --- fml-4.0-stable-20040215_org/contrib/mail2pager/euc2jiskuten.pl 1997-08-18 23:07:25.000000000 +0900 +++ fml-4.0-stable-20040215/contrib/mail2pager/euc2jiskuten.pl 2025-03-20 08:07:48.201255158 +0900 @@ -22,8 +22,10 @@ exit 0; sub Init { - require 'getopts.pl'; - &Getopts("d"); + #require 'getopts.pl'; + #&Getopts("d"); + use Getopt::Std; + getopts('d'); $debug = 1 if $opt_d; diff -uprN fml-4.0-stable-20040215_org/databases/examples/ldap-toymodel/dump.pl fml-4.0-stable-20040215/databases/examples/ldap-toymodel/dump.pl --- fml-4.0-stable-20040215_org/databases/examples/ldap-toymodel/dump.pl 2000-07-20 21:59:21.000000000 +0900 +++ fml-4.0-stable-20040215/databases/examples/ldap-toymodel/dump.pl 2025-03-20 13:10:22.224086105 +0900 @@ -8,8 +8,10 @@ # # getopt() -require 'getopts.pl'; -&Getopts("dhm:"); +#require 'getopts.pl'; +#&Getopts("dhm:"); +use Getopt::Std; +getopts('dhm:'); $| = 1; $ML = $opt_m || 'elena'; diff -uprN fml-4.0-stable-20040215_org/databases/ldap/toymodel.pl fml-4.0-stable-20040215/databases/ldap/toymodel.pl --- fml-4.0-stable-20040215_org/databases/ldap/toymodel.pl 2003-12-17 23:45:43.000000000 +0900 +++ fml-4.0-stable-20040215/databases/ldap/toymodel.pl 2025-03-20 08:13:12.537207569 +0900 @@ -350,8 +350,10 @@ if ($0 eq __FILE__) { eval "sub Log { print \@_, \"\\n\";}"; # getopt() - require 'getopts.pl'; - &Getopts("a:dhm:r:b:Dk:RA:"); + #require 'getopts.pl'; + #&Getopts("a:dhm:r:b:Dk:RA:"); + use Getopt::Std; + getopts('a:dhm:r:b:Dk:RA:'); if ($opt_h) { print "$0: [options] [query_filter]\n"; diff -uprN fml-4.0-stable-20040215_org/databases/postgresql/dynamic_active.pl fml-4.0-stable-20040215/databases/postgresql/dynamic_active.pl --- fml-4.0-stable-20040215_org/databases/postgresql/dynamic_active.pl 2000-10-28 22:56:30.000000000 +0900 +++ fml-4.0-stable-20040215/databases/postgresql/dynamic_active.pl 2025-03-20 08:14:58.983626286 +0900 @@ -470,8 +470,10 @@ if ($0 eq __FILE__) { eval "sub Log { print \@_, \"\\n\";}"; # getopt() - require 'getopts.pl'; - &Getopts("dh"); + #require 'getopts.pl'; + #&Getopts("dh"); + use Getopt::Std; + getopts('dh'); my (%mib); $mib{'dbname'} = $opt_D || 'fml'; diff -uprN fml-4.0-stable-20040215_org/libexec/confirmd.pl fml-4.0-stable-20040215/libexec/confirmd.pl --- fml-4.0-stable-20040215_org/libexec/confirmd.pl 2004-02-15 21:39:06.000000000 +0900 +++ fml-4.0-stable-20040215/libexec/confirmd.pl 2025-03-22 09:20:22.656660780 +0900 @@ -41,8 +41,10 @@ exit 0; sub Init { - require 'getopts.pl'; - &Getopts("du:w:"); + #require 'getopts.pl'; + #&Getopts("du:w:"); + use Getopt::Std; + getopts('du:w:'); # varialbes: argv[1] must be $DIR. $DIR = shift @ARGV; diff -uprN fml-4.0-stable-20040215_org/libexec/fml_local.pl fml-4.0-stable-20040215/libexec/fml_local.pl --- fml-4.0-stable-20040215_org/libexec/fml_local.pl 2004-02-15 21:39:06.000000000 +0900 +++ fml-4.0-stable-20040215/libexec/fml_local.pl 2025-03-22 20:41:23.253006384 +0900 @@ -430,7 +430,7 @@ sub FmlLocalSearchMatch local(@pat) = split(/\n/, $s); # for multiple lines. the entry to match is within "one line" - $* = 0; +# $* = 0; # compare %Envelope patterns given by "rc" entry ($s) foreach $pat (@pat) { @@ -3216,7 +3216,7 @@ sub GetFieldsFromHeader ### Header Fields Extraction $s = $Envelope{'Header'}."\n"; - $* = 0; # match one line +# $* = 0; # match one line if ($s =~ /^From\s+(\S+)/i) { # XXX NO REACH HERE (1999/10/27 by fukachan) # $Envelope{'UnixFrom'} = $UnixFrom = $1; diff -uprN fml-4.0-stable-20040215_org/libexec/fmlserv.pl fml-4.0-stable-20040215/libexec/fmlserv.pl --- fml-4.0-stable-20040215_org/libexec/fmlserv.pl 2004-02-15 21:39:06.000000000 +0900 +++ fml-4.0-stable-20040215/libexec/fmlserv.pl 2025-03-22 21:01:35.476015465 +0900 @@ -738,12 +738,13 @@ sub Save_mainNS &Log($@) if $@; $NameSpaceS{$key} = 1; } - if (defined @entry) { + #if (defined @entry) { + if (@entry) { eval "\@org'$key = \@main'$key;"; &Log($@) if $@; $NameSpaceA{$key} = 1; } - if ($key ne "_$package" && defined %entry) { + if ($key ne "_$package" && %entry) { eval "\%org'$key = \%main'$key;"; &Log($@) if $@; $NameSpaceAA{$key} = 1; @@ -771,9 +772,10 @@ sub Dump_mainNS next if ($key !~ /^[A-Z_0-9]+$/) || $key eq 'ENV' || $key =~ /^_/; local(*entry) = $val; - if (defined $entry) { print OUT "$key\t$entry\n";} - if (defined @entry) { print OUT "$key\t@entry\n";} - if ($key ne "_$package" && defined %entry) { + #if (defined $entry) { print OUT "$key\t$entry\n";} + #if (defined @entry) { print OUT "$key\t@entry\n";} + if (@entry) { print OUT "$key\t@entry\n";} + if ($key ne "_$package" && %entry) { print OUT "$key\t",join(" ", %entry),"\n"; } } @@ -976,13 +978,15 @@ sub main'LoadMLNS $ML_NameSpaceS{$key} = 1; } - if (defined @key) { + #if (defined @key) { + if (@key) { eval "\@main'$key = \@ml'$key;"; &main'Log($@) if $@; #'; $ML_NameSpaceA{$key} = 1; } - if ($key ne "_$package" && defined %key) { + #if ($key ne "_$package" && defined %key) { + if ($key ne "_$package" && %key) { eval "\%main'$key = \%ml'$key;"; &main'Log($@) if $@; #'; $ML_NameSpaceAA{$key} = 1; diff -uprN fml-4.0-stable-20040215_org/libexec/mead.pl fml-4.0-stable-20040215/libexec/mead.pl --- fml-4.0-stable-20040215_org/libexec/mead.pl 2004-02-15 21:39:06.000000000 +0900 +++ fml-4.0-stable-20040215/libexec/mead.pl 2025-03-22 09:20:22.674659679 +0900 @@ -1175,8 +1175,10 @@ sub Init &GetTime; $| = 1; - require 'getopts.pl'; - &Getopts("dD:e:S:hC:i:l:M:m:E:p:z:k:f:"); + #require 'getopts.pl'; + #&Getopts("dD:e:S:hC:i:l:M:m:E:p:z:k:f:"); + use Getopt::Std; + getopts('dD:e:S:hC:i:l:M:m:E:p:z:k:f:'); $opt_h && die(&Usage); $debug = $opt_d ? 100 : 0; diff -uprN fml-4.0-stable-20040215_org/makefml fml-4.0-stable-20040215/makefml --- fml-4.0-stable-20040215_org/makefml 2003-01-26 20:18:01.000000000 +0900 +++ fml-4.0-stable-20040215/makefml 2025-03-22 21:08:41.887959792 +0900 @@ -13,7 +13,7 @@ # ### AUTOMATICALLY REPLACED by makefml (Sun, 9 Mar 97 19:57:48 ) -$CONFIG_DIR = ''; # __MAKEFML_AUTO_REPLACED_HERE__ +$CONFIG_DIR = '/usr/local/fml/.fml'; # __MAKEFML_AUTO_REPLACED_HERE__ &InitTTY; &InitMakeFml; @@ -136,8 +136,10 @@ sub InitMakeFml if ($ENV{'MAKEFML'}) { unshift(@ARGV, split(/\s+/, $ENV{'MAKEFML'})); } - require 'getopts.pl'; - &Getopts("adhf:A:O:p:D:vwV:mi:u:UFE:W:c:"); + #require 'getopts.pl'; + #&Getopts("adhf:A:O:p:D:vwV:mi:u:UFE:W:c:"); + use Getopt::Std; + getopts('adhf:A:O:p:D:vwV:mi:u:UFE:W:c:'); # toggle flags # $CGIInstallMode = ($opt_W =~ /cgi/i) ? 1 : 0; @@ -6355,7 +6357,8 @@ sub main::Dumpvar $buf .= "\$$key = '$entry';\n"; } - if (defined @entry) { + # if (defined @entry) { + if (@entry) { $buf .= "\@$key = (\n"; foreach $num ($[ .. $#entry) { $buf .= "\t'$entry[$num]',\n"; @@ -6364,12 +6367,14 @@ sub main::Dumpvar } if ((($] !~ /5\.\d\d\d/) && - $key ne "_$package" && $key ne "_DB" && defined %entry +# $key ne "_$package" && $key ne "_DB" && defined %entry + $key ne "_$package" && $key ne "_DB" && %entry ) || (($] =~ /5\.\d\d\d/) && $key ne "$package::" && $key ne "DB::" && - (defined %entry) && +# (defined %entry) && + (%entry) && ($dumpPackages || $key !~ /::$/) && ($key !~ /^_