23 files changed, 168 insertions, 105 deletions
diff --git a/regress/base/Makefile b/regress/base/Makefile
index a2097ea7..7b66684f 100644
--- a/regress/base/Makefile
+++ b/regress/base/Makefile
@@ -1,5 +1,5 @@
 #
-# $FML: Makefile,v 1.6 2001/08/05 13:07:34 fukachan Exp $
+# $FML: Makefile,v 1.7 2001/09/30 23:07:25 fukachan Exp $
 #
 
 PERL = perl -I ../../fml/lib -I ../../cpan/lib -I ../../img/lib
@@ -13,8 +13,9 @@ test:
 	@ $(PERL) ../base/md5.pl
 	@ echo "* FML::Date test"
 	@ $(PERL) ../base/date2unixtime.pl
-	@ echo "* Tie::Journaled{File,Dir} test"
+	@ echo "* Tie::JournaledFile test"
 	@ $(PERL) ../base/journaledfile.pl
+	@ echo "* Tie::JournaledDir test"
 	@ $(PERL) ../base/journaleddir.pl
 	@ echo "* Mail::Message module IO test"
 	@ sh ../base/multipart_io.sh
diff --git a/regress/base/cachedir.pl b/regress/base/cachedir.pl
index 4186a29e..fdc42b00 100755
--- a/regress/base/cachedir.pl
+++ b/regress/base/cachedir.pl
@@ -1,15 +1,16 @@
-#!/usr/local/bin/perl
+#!/usr/bin/env perl
 #-*- perl -*-
 #
-#  Copyright (C) 2001 Ken'ichi Fukamachi
+#  Copyright (C) 2001,2002 Ken'ichi Fukamachi
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself. 
 #
-# $FML: cachedir.pl,v 1.2 2001/04/04 12:27:30 fukachan Exp $
+# $FML: cachedir.pl,v 1.3 2001/04/04 14:47:56 fukachan Exp $
 #
 
 -d "/tmp/b" || mkdir("/tmp/b", 0755);
 
+my $debug = defined $ENV{'debug'} ? 1 : 0;
 
 use File::CacheDir;
 
diff --git a/regress/base/confirm.pl b/regress/base/confirm.pl
index 8fe40cf3..c500e82a 100755
--- a/regress/base/confirm.pl
+++ b/regress/base/confirm.pl
@@ -1,11 +1,13 @@
 #!/usr/bin/env perl
 #
-# $FML$
+# $FML: confirm.pl,v 1.1 2001/10/13 03:17:25 fukachan Exp $
 #
 
+use strict;
 use lib qw(../../fml/lib ../../cpan/lib);
 use FML::Confirm;
 
+my $debug   = defined $ENV{'debug'} ? 1 : 0;
 my $confirm = new FML::Confirm {
     cache_dir => "/tmp/confirm.cache",
     class     => "subscribe",
diff --git a/regress/base/copy.pl b/regress/base/copy.pl
index 2ba88032..909a4d91 100644
--- a/regress/base/copy.pl
+++ b/regress/base/copy.pl
@@ -1,15 +1,18 @@
-#!/usr/local/bin/perl
+#!/usr/bin/env perl
 #-*- perl -*-
 #
-#  Copyright (C) 2001 Ken'ichi Fukamachi
+#  Copyright (C) 2001,2002 Ken'ichi Fukamachi
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself. 
 #
-# $FML: copy.pl,v 1.3 2001/04/03 09:51:12 fukachan Exp $
+# $FML: copy.pl,v 1.4 2001/06/17 09:00:30 fukachan Exp $
 #
 
+use strict;
+my $debug = defined $ENV{'debug'} ? 1 : 0;
+
 unless (@ARGV) {
-    use FML::Utils qw(copy);
+    use File::Utils qw(copy);
     copy("main.cf", "/tmp/main.cf");
 }
 else {
diff --git a/regress/base/date2unixtime.pl b/regress/base/date2unixtime.pl
index bfb49c8e..44ba0624 100755
--- a/regress/base/date2unixtime.pl
+++ b/regress/base/date2unixtime.pl
@@ -1,10 +1,13 @@
 #!/usr/bin/env perl
 #
-# $FML: date2unixtime.pl,v 1.1 2001/07/08 14:02:02 fukachan Exp $
+# $FML: date2unixtime.pl,v 1.2 2001/11/18 02:22:10 fukachan Exp $
 #
 
+use strict;
 use Mail::Message::Date;
 
+my $debug = defined $ENV{'debug'} ? 1 : 0;
+
 require 'ctime.pl';
 
 my $t    = time;
@@ -12,9 +15,9 @@ my $date = ctime( $t );
 
 chop $date;
 
-my $tx = Mail::Message::Date::date_to_unixtime( $date ), "\t";
+my $tx = Mail::Message::Date::date_to_unixtime( $date );
 
-print "* date -> unixtime: $t => $date => $tx\n";
+print "* date -> unixtime: $t => $date => $tx\n" if $debug;
 
 if ($t == $tx) {
    print "ok\n";
diff --git a/regress/base/get_paragraph_info.pl b/regress/base/get_paragraph_info.pl
index 5abdd035..60ea3197 100755
--- a/regress/base/get_paragraph_info.pl
+++ b/regress/base/get_paragraph_info.pl
@@ -1,7 +1,14 @@
+#!/usr/bin/env perl
+#
+# $FML$
+#
+
 use strict;
 use File::Basename;
 use vars qw(%opts);
 
+my $debug = defined $ENV{'debug'} ? 1 : 0;
+
 use Getopt::Std;
 getopts('d', \%opts);
 
diff --git a/regress/base/journaleddir.pl b/regress/base/journaleddir.pl
index 8730deb2..92550c3e 100755
--- a/regress/base/journaleddir.pl
+++ b/regress/base/journaleddir.pl
@@ -1,10 +1,11 @@
 #!/usr/bin/env perl
 #
-# $FML: journaleddir.pl,v 1.3 2001/08/22 21:58:50 fukachan Exp $
+# $FML: journaleddir.pl,v 1.4 2001/10/18 03:40:51 fukachan Exp $
 #
 
 BEGIN {
-    print "init  journaleddir ...\n";
+    my $debug = defined $ENV{'debug'} ? 1 : 0;
+    print "init  journaleddir ...\n" if $debug;
 };
 
 use Tie::JournaledDir;
@@ -15,6 +16,7 @@ my $key  = shift || 'uja';
 my $unit = shift || 2;
 my $dir  = "/tmp/fml5/jd";
 
+my $debug = defined $ENV{'debug'} ? 1 : 0;
 
 if (-d $dir) {
     use DirHandle;
@@ -59,16 +61,18 @@ sub _read
     my $error = 0;
     my %found = %$pat;
 
-    print "check keys and values ";
+    print "check keys and values " if $debug;
     for my $k (keys %db) {
-	print ".";
+	print "." if $debug;
 	if (defined $db{$k}) {
 	    if ($db{$k} ne $pat->{$k}) {
-		print "($k) differs: [";
-		print $db{$k};
-		print "] != [";
-		print $pat->{$k};
-		print "]\n";
+		if ($debug) {
+		    print "($k) differs: [";
+		    print $db{$k};
+		    print "] != [";
+		    print $pat->{$k};
+		    print "]\n";
+		}
 		$error++;
 	    }
 
@@ -90,8 +94,10 @@ sub _read
 
     untie %db;
 
-    system "ls -l $dir";
-    print "\n";
+    if ($debug) {
+	system "ls -l $dir";
+	print "\n";
+    }
 }
 
 
@@ -99,7 +105,7 @@ sub _write
 {
     my ($pat) = @_;
 
-    print "write journaleddir ";
+    print "write journaleddir " if $debug;
     for my $key (keys %$pat) {
 	tie %db, 'Tie::JournaledDir', { 
 	    unit => $unit,
@@ -107,10 +113,10 @@ sub _write
 	};
 
 	$db{ $key } = $pat->{ $key };
-	print "$key ";
+	print "$key " if $debug;
 	sleep 1;
 
 	untie %db;
     }
-    print " done\n";
+    print " done\n" if $debug;
 }
diff --git a/regress/base/journaledfile.pl b/regress/base/journaledfile.pl
index 3b4797fa..6688172f 100755
--- a/regress/base/journaledfile.pl
+++ b/regress/base/journaledfile.pl
@@ -1,12 +1,13 @@
 #!/usr/bin/env perl
 #
-# $FML: journaledfile.pl,v 1.1 2001/08/05 13:07:59 fukachan Exp $
+# $FML: journaledfile.pl,v 1.2 2001/08/21 03:46:40 fukachan Exp $
 #
 
 use strict;
 use lib qw(../../fml/lib);
 use Tie::JournaledFile;
 
+my $debug = defined $ENV{'debug'} ? 1 : 0;
 my %db   = ();
 my $file = '/tmp/fml5/cache.txt';
 my $buf  = '';
@@ -17,11 +18,11 @@ tie %db, 'Tie::JournaledFile', { file => $file };
 $db{ $key } = $buf;
 untie %db;
 
-print "   ", `ls -l $file`;
+print "   ", `ls -l $file` if $debug;
 
 tie %db, 'Tie::JournaledFile', { file => $file };
 
-print "verify written string ... ";
+print "verify written string ... " if $debug;
 if ($db{ $key } eq $buf) {
     print "ok\n";
 } 
diff --git a/regress/base/lock.pl b/regress/base/lock.pl
index 8ed3cb4f..2251ffeb 100755
--- a/regress/base/lock.pl
+++ b/regress/base/lock.pl
@@ -1,8 +1,11 @@
-#!/usr/local/bin/perl
+#!/usr/bin/env perl
 #
-# $FML: lock.pl,v 1.4 2001/06/17 09:00:30 fukachan Exp $
+# $FML: lock.pl,v 1.5 2001/08/05 13:09:00 fukachan Exp $
 #
 
+use strict;
+my $debug = defined $ENV{'debug'} ? 1 : 0;
+
 use File::SimpleLock;
 my $lockobj = new File::SimpleLock;
 
diff --git a/regress/base/log_structured_data.pl b/regress/base/log_structured_data.pl
index ccbdc3c2..08ad834d 100755
--- a/regress/base/log_structured_data.pl
+++ b/regress/base/log_structured_data.pl
@@ -1,8 +1,10 @@
-#!/usr/local/bin/perl
+#!/usr/bin/env perl
 #
-# $FML$
+# $FML: log_structured_data.pl,v 1.1 2001/04/02 14:34:04 fukachan Exp $
 #
 
+my $debug = defined $ENV{'debug'} ? 1 : 0;
+
 use File::LogStructuredData;
 $db = new File::LogStructuredData { file => '/tmp/cache.txt' };
 
diff --git a/regress/base/md5.pl b/regress/base/md5.pl
index 6b0d8d54..4fb8bc1c 100644
--- a/regress/base/md5.pl
+++ b/regress/base/md5.pl
@@ -1,16 +1,19 @@
-#!/usr/local/bin/perl
+#!/usr/bin/env perl
 #-*- perl -*-
 #
-#  Copyright (C) 2001 Ken'ichi Fukamachi
+#  Copyright (C) 2001,2002 Ken'ichi Fukamachi
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself. 
 #
-# $FML: md5.pl,v 1.4 2001/06/17 09:00:29 fukachan Exp $
+# $FML: md5.pl,v 1.5 2001/12/23 03:01:27 fukachan Exp $
 #
 
-$file = shift || '/etc/group';
+use strict;
+use Carp;
 
-my $body; 
+my $debug = defined $ENV{'debug'} ? 1 : 0;
+my $file  = shift || '/etc/group';
+my $body  = ''; 
 
 use FileHandle;
 my $fh = new FileHandle $file;
@@ -18,10 +21,10 @@ while (<$fh>) { $body .=  $_;}
 close($fh);
 
 use Mail::Message::Checksum;
-$p = new Mail::Message::Checksum;
+my $p = new Mail::Message::Checksum;
 
-$internal = $p->md5( \$body );
-$external = program($file);
+my $internal = $p->md5( \$body );
+my $external = program($file);
 
 print "Mail::Message::Checksum::md5 ... ";
 print (($internal eq $external) ? "ok" : "fail");
@@ -34,6 +37,7 @@ exit 0;
 sub program
 {
     my ($file) = @_;
+    my (@x) = ();
 
     use IO::Handle;
     $fh = new IO::Handle;
diff --git a/regress/base/mime.pl b/regress/base/mime.pl
index 134dc6f1..e6a7d098 100755
--- a/regress/base/mime.pl
+++ b/regress/base/mime.pl
@@ -1,6 +1,6 @@
-#!/usr/local/bin/perl
+#!/usr/bin/env perl
 #
-# $FML: mime.pl,v 1.6 2001/06/17 09:00:30 fukachan Exp $
+# $FML: mime.pl,v 1.7 2001/12/23 06:44:34 fukachan Exp $
 #
 
 use strict;
@@ -10,6 +10,7 @@ use Mail::Message::Encode qw(encode_mime_string);
 use MIME::Base64;
 use MIME::QuotedPrint;
 
+my $debug = defined $ENV{'debug'} ? 1 : 0;
 
 &try_mime(" ");
 &try_mime("��");
@@ -40,7 +41,7 @@ sub try_mime
     $buf .=  "<". $out_str_qp. "<\n";
 
     $buf =~ s/\n/\n   |/g;
-    print $buf, "\n";
+    print $buf, "\n" if $debug;
     print ($orig_str eq $out_str_b64 ? "base64 ... ok\n" : "fail\n");
     print ($orig_str eq $out_str_qp  ? "qp     ... ok\n" : "fail\n");
 }
diff --git a/regress/base/mime_decode.pl b/regress/base/mime_decode.pl
index 128961e5..981c58c9 100755
--- a/regress/base/mime_decode.pl
+++ b/regress/base/mime_decode.pl
@@ -1,13 +1,14 @@
-#!/usr/pkg/bin/perl
+#!/usr/bin/env perl
 #
-# $FML: mime_encode.pl,v 1.1 2001/09/23 14:32:34 fukachan Exp $
+# $FML: mime_decode.pl,v 1.1 2001/10/19 13:16:19 fukachan Exp $
 #
 
 use strict;
 use lib qw(../../cpan/lib ../../fml/lib ../../im/lib);
 use MIME::Base64;
 
-my $buf = '';
+my $debug = defined $ENV{'debug'} ? 1 : 0;
+my $buf   = '';
 
 while (<>) {
 	$buf .= $_; 
diff --git a/regress/base/mime_encode.pl b/regress/base/mime_encode.pl
index 2e99ea7c..4961dac5 100755
--- a/regress/base/mime_encode.pl
+++ b/regress/base/mime_encode.pl
@@ -1,12 +1,13 @@
-#!/usr/pkg/bin/perl
+#!/usr/bin/env perl
 #
-# $FML$
+# $FML: mime_encode.pl,v 1.1 2001/09/23 14:32:34 fukachan Exp $
 #
 
 use strict;
 use lib qw(../../cpan/lib ../../fml/lib ../../im/lib);
 use MIME::Base64;
 
+my $debug = defined $ENV{'debug'} ? 1 : 0;
 my $buf = '';
 
 while (<>) {
diff --git a/regress/base/modulus_seq.pl b/regress/base/modulus_seq.pl
index c8517cba..9fbbe2c5 100755
--- a/regress/base/modulus_seq.pl
+++ b/regress/base/modulus_seq.pl
@@ -1,9 +1,11 @@
-#!/usr/local/bin/perl
+#!/usr/bin/env perl
 #
-# $FML: modulus_seq.pl,v 1.1 2001/02/21 03:41:18 fukachan Exp $
+# $FML: modulus_seq.pl,v 1.2 2001/06/17 09:00:30 fukachan Exp $
 #
 
-$seq_file = "/tmp/.seq";
+use strict;
+my $debug    = defined $ENV{'debug'} ? 1 : 0;
+my $seq_file = "/tmp/.seq";
 
 for ( 1 .. 10 ) {
     &id;
diff --git a/regress/base/multipart_io.pl b/regress/base/multipart_io.pl
index 4304af5d..45b1fb19 100644
--- a/regress/base/multipart_io.pl
+++ b/regress/base/multipart_io.pl
@@ -1,7 +1,14 @@
+#!/usr/bin/env perl
+#
+# $FML$
+#
+
 use strict;
 use File::Basename;
 use vars qw(%opts);
 
+my $debug = defined $ENV{'debug'} ? 1 : 0;
+
 use Getopt::Std;
 getopts('d', \%opts);
 
diff --git a/regress/base/multipart_maker.pl b/regress/base/multipart_maker.pl
index b6938cce..5decb16f 100755
--- a/regress/base/multipart_maker.pl
+++ b/regress/base/multipart_maker.pl
@@ -1,6 +1,6 @@
-#!/usr/local/bin/perl
+#!/usr/bin/env perl
 #
-# $FML: multipart_maker.pl,v 1.8 2001/04/07 06:35:54 fukachan Exp $
+# $FML: multipart_maker.pl,v 1.9 2001/05/06 08:25:02 fukachan Exp $
 #
 
 use strict;
@@ -8,13 +8,13 @@ use File::Basename;
 use Mail::Message;
 use Getopt::Std;
 
-my %opts;
+my $debug = defined $ENV{'debug'} ? 1 : 0;
 
+my %opts;
 getopts('mr:', \%opts);
 
 my $rcpt = $opts{ r } || undef; 
-
-my $dir = dirname($0);
+my $dir  = dirname($0);
 
 $| = 1;
 
diff --git a/regress/base/search.pl b/regress/base/search.pl
index c3a16b4f..7393a2e5 100755
--- a/regress/base/search.pl
+++ b/regress/base/search.pl
@@ -1,17 +1,17 @@
-#!/usr/local/bin/perl
+#!/usr/bin/env perl
 #-*- perl -*-
 #
-#  Copyright (C) 2001 Ken'ichi Fukamachi
+#  Copyright (C) 2001,2002 Ken'ichi Fukamachi
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself. 
 #
-# $FML: search.pl,v 1.1 2001/04/15 09:09:03 fukachan Exp $
+# $FML: search.pl,v 1.2 2001/05/04 14:32:35 fukachan Exp $
 #
 
 use IO::Adapter;
-
-my $map = shift || 'file:/var/spool/ml/elena/actives';
-my $obj = new IO::Adapter $map;
+my $debug = defined $ENV{'debug'} ? 1 : 0;
+my $map   = shift || 'file:/var/spool/ml/elena/actives';
+my $obj   = new IO::Adapter $map;
 
 $obj->open || croak("cannot open $map");
 while ($x = $obj->getline) { print "<< ", $x if $x =~ /\S+/;}
diff --git a/regress/base/search_max_id.pl b/regress/base/search_max_id.pl
index 369769c1..4fee7dea 100755
--- a/regress/base/search_max_id.pl
+++ b/regress/base/search_max_id.pl
@@ -5,14 +5,15 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself. 
 #
-# $FML: search_max_id.pl,v 1.1 2001/11/20 07:02:57 fukachan Exp $
+# $FML: search_max_id.pl,v 1.2 2002/01/27 13:20:03 fukachan Exp $
 #
 
 use strict;
 use lib qw(../../fml/lib ../../cpan/lib ../../img/lib);
-
 use Benchmark;
 
+my $debug = defined $ENV{'debug'} ? 1 : 0;
+
 use File::Sequence;
 my $obj = new File::Sequence;
 my $max_id = $ENV{'max_id'};
@@ -25,25 +26,29 @@ for my $file (@ARGV) {
     use Fcntl;
     tie %db, 'AnyDBM_File', $f, O_RDWR|O_CREAT, 0644;
 
-    print STDERR "\nsearch with pebot:\n";
-    print STDERR "max = ";
-    my $t0 = new Benchmark;
-    print STDERR $obj->search_max_id( { hash => \%db } );
-    my $t1 = new Benchmark;
-    my $td = timediff($t1, $t0);
-    print STDERR " ", timestr($td), "\n";
-
-
-    print STDERR "\nfull search:\n";
-    print STDERR "max = ";
-    my $t0 = new Benchmark;
-    print STDERR $obj->search_max_id( { 
-	hash => \%db,
-	full_search => 1,
-    } );
-    my $t1 = new Benchmark;
-    my $td = timediff($t1, $t0);
-    print STDERR " ", timestr($td), "\n";
+    {
+	print STDERR "\nsearch with pebot:\n";
+	print STDERR "max = ";
+	my $t0 = new Benchmark;
+	print STDERR $obj->search_max_id( { hash => \%db } );
+	my $t1 = new Benchmark;
+	my $td = timediff($t1, $t0);
+	print STDERR " ", timestr($td), "\n";
+    }
+
+
+    {
+	print STDERR "\nfull search:\n";
+	print STDERR "max = ";
+	my $t0 = new Benchmark;
+	print STDERR $obj->search_max_id( { 
+	    hash => \%db,
+	    full_search => 1,
+	} );
+	my $t1 = new Benchmark;
+	my $td = timediff($t1, $t0);
+	print STDERR " ", timestr($td), "\n";
+    }
 
 }
 
diff --git a/regress/base/string.pl b/regress/base/string.pl
index 40b6f775..03bb9c53 100755
--- a/regress/base/string.pl
+++ b/regress/base/string.pl
@@ -1,15 +1,18 @@
-#!/usr/local/bin/perl
+#!/usr/bin/env perl
 #-*- perl -*-
 #
 #  Copyright (C) 2001 Ken'ichi Fukamachi
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself. 
 #
-# $FML: string.pl,v 1.3 2001/04/03 09:51:12 fukachan Exp $
+# $FML: string.pl,v 1.4 2001/06/17 09:00:30 fukachan Exp $
 #
 
+use strict;
 use lib qw(./lib/ ../../cpan/lib);
-use Dialect::ISO2022JP qw(STR2EUC);
+use FML::Language::ISO2022JP qw(STR2EUC);
+
+my $debug = defined $ENV{'debug'} ? 1 : 0;
 
 for (@ARGV) {
     my $x = &STR2EUC($_);
diff --git a/regress/base/virtual_maps.pl b/regress/base/virtual_maps.pl
index 14ff6056..70774bf5 100755
--- a/regress/base/virtual_maps.pl
+++ b/regress/base/virtual_maps.pl
@@ -1,8 +1,11 @@
 #!/usr/bin/env perl
 #
-# $FML$
+# $FML: virtual_maps.pl,v 1.1 2002/02/13 12:30:35 fukachan Exp $
 #
 
+use strict;
+my $debug = defined $ENV{'debug'} ? 1 : 0;
+
 if (-f "/etc/postfix/virtual") {
     print "IO::Adapter::find() for /etc/postfix/virtual\n";
 
@@ -13,17 +16,23 @@ if (-f "/etc/postfix/virtual") {
     if (defined $map) {
 	$map->open;
 
-	print "# want is not specified.\n";
-	my $r = $map->find('^nuinui');
-	print $r, "\n";
-
-	print "# want = key,value\n";
-	my $r = $map->find('^nuinui', { want => 'key,value' } );
-	print $r, "\n";
-
-	print "# want = key\n";
-	my $r = $map->find('^nuinui', { want => 'key' } );
-	print $r, "\n";
+	{
+	    print "# want is not specified.\n";
+	    my $r = $map->find('^nuinui');
+	    print $r, "\n";
+	}
+
+	{
+	    print "# want = key,value\n";
+	    my $r = $map->find('^nuinui', { want => 'key,value' } );
+	    print $r, "\n";
+	}
+
+	{
+	    print "# want = key\n";
+	    my $r = $map->find('^nuinui', { want => 'key' } );
+	    print $r, "\n";
+	}
 
     }
     else {
diff --git a/regress/cf/test.overload.pl b/regress/cf/test.overload.pl
index 36bec981..f03f9b66 100755
--- a/regress/cf/test.overload.pl
+++ b/regress/cf/test.overload.pl
@@ -1,6 +1,6 @@
 #!/usr/local/bin/perl
 #
-# $FML: mime.pl,v 1.6 2001/06/17 09:00:30 fukachan Exp $
+# $FML: test.overload.pl,v 1.1 2001/08/24 11:55:55 fukachan Exp $
 #
 
 use strict;
@@ -8,15 +8,16 @@ use Carp;
 use lib qw(../../fml/lib ../../cpan/lib);
 use FML::Config;
 
+my $debug  = defined $ENV{'debug'} ? 1 : 0;
 my $config = new FML::Config;
 my @prev_x = ();
-my $i = 0;
+my $i      = 0;
 
 for my $f (@ARGV) {
     $config->overload($f);
 
     my $x = $config->{ 'x' };
-    print STDERR "   x = $x (loaded $f)\n";
+    print STDERR "   x = $x (loaded $f)\n" if $debug;
 
     # save values
     $prev_x[ $i ] = $x; $i++;
diff --git a/regress/message/basic_io.pl b/regress/message/basic_io.pl
index be6731ff..126c02ed 100755
--- a/regress/message/basic_io.pl
+++ b/regress/message/basic_io.pl
@@ -1,11 +1,11 @@
-#!/usr/local/bin/perl
+#!/usr/bin/env perl
 #-*- perl -*-
 #
 #  Copyright (C) 2001 Ken'ichi Fukamachi
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself. 
 #
-# $FML: basic_io.pl,v 1.3 2001/04/13 04:03:11 fukachan Exp $
+# $FML: basic_io.pl,v 1.4 2001/04/13 04:34:07 fukachan Exp $
 #
 
 use strict;