remove $ENV{debug} based toggle flagsubdir-base

10 files changed, 32 insertions, 30 deletions

diff --git a/fml/lib/Mail/Bounce.pm b/fml/lib/Mail/Bounce.pm
index c74798b2..8023f389 100644
--- a/fml/lib/Mail/Bounce.pm
+++ b/fml/lib/Mail/Bounce.pm
@@ -4,7 +4,7 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself.
 #
-# $FML: Bounce.pm,v 1.18 2002/01/16 13:34:01 fukachan Exp $
+# $FML: Bounce.pm,v 1.19 2002/01/16 13:43:21 fukachan Exp $
 #
 
 package Mail::Bounce;
@@ -12,7 +12,7 @@ use strict;
 use vars qw(@ISA @EXPORT @EXPORT_OK $AUTOLOAD);
 use Carp;
 
-my $debug = $ENV{'debug'} ? 1 : 0;
+my $debug = 0;
 
 =head1 NAME
 
diff --git a/fml/lib/Mail/Bounce/DSN.pm b/fml/lib/Mail/Bounce/DSN.pm
index 9e22c6f3..62a3b2c6 100644
--- a/fml/lib/Mail/Bounce/DSN.pm
+++ b/fml/lib/Mail/Bounce/DSN.pm
@@ -4,7 +4,7 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself.
 #
-# $FML: DSN.pm,v 1.15 2002/01/16 13:34:02 fukachan Exp $
+# $FML: DSN.pm,v 1.16 2002/01/16 13:43:21 fukachan Exp $
 #
 
 
@@ -14,7 +14,7 @@ use strict;
 use vars qw(@ISA @EXPORT @EXPORT_OK $AUTOLOAD);
 use Carp;
 
-my $debug = $ENV{'debug'} ? 1 : 0;
+my $debug = 0;
 
 @ISA = qw(Mail::Bounce);
 
diff --git a/fml/lib/Mail/Bounce/FixBrokenAddress.pm b/fml/lib/Mail/Bounce/FixBrokenAddress.pm
index 361a8d52..648f8dc6 100644
--- a/fml/lib/Mail/Bounce/FixBrokenAddress.pm
+++ b/fml/lib/Mail/Bounce/FixBrokenAddress.pm
@@ -1,10 +1,10 @@
 #-*- 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: FixBrokenAddress.pm,v 1.4 2001/12/22 09:21:15 fukachan Exp $
+# $FML: FixBrokenAddress.pm,v 1.5 2001/12/23 15:03:27 fukachan Exp $
 #
 
 
@@ -14,7 +14,7 @@ use strict;
 use vars qw(@ISA @EXPORT @EXPORT_OK $AUTOLOAD);
 use Carp;
 
-my $debug = $ENV{'debug'} ? 1 : 0;
+my $debug = 0;
 
 @ISA = qw(Mail::Bounce);
 
@@ -73,7 +73,7 @@ Ken'ichi Fukamachi
 
 =head1 COPYRIGHT
 
-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.
diff --git a/fml/lib/Mail/Bounce/Language/Japanese.pm b/fml/lib/Mail/Bounce/Language/Japanese.pm
index f50f85ef..6829cb46 100644
--- a/fml/lib/Mail/Bounce/Language/Japanese.pm
+++ b/fml/lib/Mail/Bounce/Language/Japanese.pm
@@ -1,10 +1,10 @@
 #-*- 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: Japanese.pm,v 1.3 2001/12/22 09:21:16 fukachan Exp $
+# $FML: Japanese.pm,v 1.4 2001/12/24 02:26:33 fukachan Exp $
 #
 
 #
@@ -17,7 +17,7 @@ use strict;
 use vars qw(@ISA @EXPORT @EXPORT_OK $AUTOLOAD);
 use Carp;
 
-my $debug = $ENV{'debug'} ? 1 : 0;
+my $debug = 0;
 
 @ISA = qw(Mail::Bounce);
 
@@ -111,7 +111,7 @@ Ken'ichi Fukamachi
 
 =head1 COPYRIGHT
 
-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.
diff --git a/fml/lib/Mail/Bounce/Postfix19991231.pm b/fml/lib/Mail/Bounce/Postfix19991231.pm
index 4082e306..9033713a 100644
--- a/fml/lib/Mail/Bounce/Postfix19991231.pm
+++ b/fml/lib/Mail/Bounce/Postfix19991231.pm
@@ -4,7 +4,7 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself.
 #
-# $FML: Postfix19991231.pm,v 1.14 2002/01/16 13:34:02 fukachan Exp $
+# $FML: Postfix19991231.pm,v 1.15 2002/01/16 13:43:21 fukachan Exp $
 #
 
 
@@ -14,6 +14,8 @@ use strict;
 use vars qw(@ISA @EXPORT @EXPORT_OK $AUTOLOAD);
 use Carp;
 
+my $debug = 0;
+
 @ISA = qw(Mail::Bounce);
 
 =head1 NAME
@@ -90,7 +92,7 @@ sub _analyze_plaintext
 		my $data = $m->nth_paragraph( $i + 1 );
 
 		# debug
-		print STDERR "paragraph($i){$data}\n" if $ENV{'debug'};
+		print STDERR "paragraph($i){$data}\n" if $debug;
 
 		if ($data =~ /$pattern/)     { $state = 1;}
 		if ($data =~ /$end_pattern/) { $state = 0;}
@@ -126,7 +128,7 @@ sub _analyze_broken_dsn
 	    my $data = $m->nth_paragraph( $i + 1 );
 
 	    # debug
-	    print STDERR "paragraph($i){$data}\n" if $ENV{'debug'};
+	    print STDERR "paragraph($i){$data}\n" if $debug;
 
 	    if ($data =~ /\<(\S+\@\S+\w+)\>:\s*(.*)/) {
 		$self->_parse_address($data, $result);
diff --git a/fml/lib/Mail/Bounce/SimpleMatch.pm b/fml/lib/Mail/Bounce/SimpleMatch.pm
index 11f1d09e..47a78432 100644
--- a/fml/lib/Mail/Bounce/SimpleMatch.pm
+++ b/fml/lib/Mail/Bounce/SimpleMatch.pm
@@ -4,7 +4,7 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself.
 #
-# $FML: SimpleMatch.pm,v 1.27 2002/01/16 13:34:02 fukachan Exp $
+# $FML: SimpleMatch.pm,v 1.28 2002/01/16 13:43:21 fukachan Exp $
 #
 
 
@@ -46,7 +46,7 @@ When we trap C<end>,   the state changes from l to 0.
 
 =cut
 
-my $debug = $ENV{'debug'} ? 1 : 0;
+my $debug = 0;
 
 my $address_trap_regexp = {
 
diff --git a/fml/lib/Mail/HTML/Lite.pm b/fml/lib/Mail/HTML/Lite.pm
index c350cdd7..035d42d5 100644
--- a/fml/lib/Mail/HTML/Lite.pm
+++ b/fml/lib/Mail/HTML/Lite.pm
@@ -4,7 +4,7 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself.
 #
-# $FML: Lite.pm,v 1.37 2002/01/14 11:59:02 fukachan Exp $
+# $FML: Lite.pm,v 1.38 2002/01/16 13:34:03 fukachan Exp $
 #
 
 package Mail::HTML::Lite;
@@ -12,10 +12,10 @@ use strict;
 use vars qw(@ISA @EXPORT @EXPORT_OK $AUTOLOAD);
 use Carp;
 
-my $debug = $ENV{'debug'} ? 1 : 0;
+my $debug = 0;
 my $URL   = "<A HREF=\"http://www.fml.org/software/\">Mail::HTML::Lite</A>";
 
-my $version = q$FML: Lite.pm,v 1.37 2002/01/14 11:59:02 fukachan Exp $;
+my $version = q$FML: Lite.pm,v 1.38 2002/01/16 13:34:03 fukachan Exp $;
 if ($version =~ /,v\s+([\d\.]+)\s+/) {
     $version = "$URL $1";
 }
@@ -2291,7 +2291,7 @@ sub htmlify_file
 	directory => $dst_dir,
     };
 
-    if (defined $ENV{'debug'}) {
+    if ($debug) {
 	printf STDERR "htmlify_file( id=%-6s src=%s )\n", $id, $file;
     }
 
@@ -2307,7 +2307,7 @@ sub htmlify_file
 
     # no more action for old files
     if ($html->is_ignore($id)) {
-	warn("not process $id (already exists)") if defined $ENV{'debug'};
+	warn("not process $id (already exists)") if $debug;
     }
     else {
 	printf STDERR "   converted( id=%-6s src=%s )\n", $id, $file;
diff --git a/fml/lib/Mail/Message.pm b/fml/lib/Mail/Message.pm
index 034a1460..209f11a8 100644
--- a/fml/lib/Mail/Message.pm
+++ b/fml/lib/Mail/Message.pm
@@ -4,7 +4,7 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself.
 #
-# $FML: Message.pm,v 1.46 2002/01/16 14:01:14 fukachan Exp $
+# $FML: Message.pm,v 1.47 2002/01/18 15:38:41 fukachan Exp $
 #
 
 package Mail::Message;
@@ -12,7 +12,7 @@ use strict;
 use vars qw(@ISA @EXPORT @EXPORT_OK $AUTOLOAD $InComingMessage);
 use Carp;
 
-my $debug = $ENV{'debug'} ? $ENV{'debug'} : 0;
+my $debug = 0;
 
 # virtual content-type
 my %virtual_data_type =
@@ -1318,7 +1318,7 @@ sub parse_and_build_mime_multipart_chain
 	    if ($debug) {
 		my $r = substr($$data, $pb, $pe - $pb);
 		print "[ data_type=$args->{ data_type } ]\n";
-		print "{$r}\n" if $ENV{'debug'} > 1;
+		print "{$r}\n" if $debug > 1;
 	    }
 
 	    $m[ $i++ ] = $self->_alloc_new_part($args);
diff --git a/fml/lib/Mail/ThreadTrack/Analyze.pm b/fml/lib/Mail/ThreadTrack/Analyze.pm
index 483bd3a2..0ed5ee27 100644
--- a/fml/lib/Mail/ThreadTrack/Analyze.pm
+++ b/fml/lib/Mail/ThreadTrack/Analyze.pm
@@ -4,7 +4,7 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself.
 #
-# $FML: Analyze.pm,v 1.23 2002/01/16 13:34:04 fukachan Exp $
+# $FML: Analyze.pm,v 1.24 2002/01/16 13:43:22 fukachan Exp $
 #
 
 package Mail::ThreadTrack::Analyze;
@@ -12,7 +12,7 @@ use strict;
 use vars qw(@ISA @EXPORT @EXPORT_OK $AUTOLOAD);
 use Carp;
 
-my $debug = defined $ENV{'debug'} ? 1 : 0;
+my $debug = 0;
 
 =head1 NAME
 
@@ -283,7 +283,7 @@ sub _is_ignore
     while (($field, $rule) = each %$filterlist) {
 	if (defined $header->get($field)) {
 	    my $value = $header->get($field);
-	    if ($ENV{'debug'}) {
+	    if ($debug) {
 		print STDERR "ignore $field: $value\n" if $value =~ /$rule/m;
 	    }
 	    return 1 if $value =~ /$rule/;
diff --git a/fml/lib/Mail/ThreadTrack/DB.pm b/fml/lib/Mail/ThreadTrack/DB.pm
index 3b83e7fa..6fea43e1 100644
--- a/fml/lib/Mail/ThreadTrack/DB.pm
+++ b/fml/lib/Mail/ThreadTrack/DB.pm
@@ -4,7 +4,7 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself.
 #
-# $FML: DB.pm,v 1.19 2002/01/13 13:35:30 fukachan Exp $
+# $FML: DB.pm,v 1.20 2002/01/30 14:51:16 fukachan Exp $
 #
 
 package Mail::ThreadTrack::DB;
@@ -12,7 +12,7 @@ use strict;
 use vars qw(@ISA @EXPORT @EXPORT_OK $AUTOLOAD);
 use Carp;
 
-my $debug = defined $ENV{'debug'} ? 1 : 0;
+my $debug = 0;
 
 =head1 NAME