im-147im-147

82 files changed, 842 insertions, 428 deletions

diff --git a/img/dist/IM/00changes b/img/dist/IM/00changes
index 3d6bd8d2..fd60b64e 100644
--- a/img/dist/IM/00changes
+++ b/img/dist/IM/00changes
@@ -1,3 +1,15 @@
+147 (2004/07/04)
+
+* imsetup.in, cnf.im/SiteConfig.in, dot.im/Config: Add `MsgIdUser'.
+* imput.in: New option `--msgiduser'.
+* dot.im/get.sbr.refile: New file.  A sample file for auto-refiling.
+* imsetup.in, cnf.im/SiteConfig.in, dot.im/Config: Add samples for using
+  `MboxFilter'.
+* New config variable `MboxFilter'. (Thanks to Jacques GARRIGUE)
+* im*.in: Accept `--version' option.
+* imsetup.in, cnf.im/SiteConfig.in, dot.im/Config: Add %INBOX for IMAP.
+* imget.in: Doc fix, describe how to set IMAP folder.
+
 146 (2003/10/28)
 
 * IM/TcpTransaction.pm, IM/Pop.pm, IM/Nntp.pm, IM/Imap.pm: Don't use $! as
diff --git a/img/dist/IM/00diff b/img/dist/IM/00diff
index f20fe730..c0f96d90 100644
--- a/img/dist/IM/00diff
+++ b/img/dist/IM/00diff
@@ -1,3 +1,11 @@
+		Differences between IM147 and IM146
+
+* New config variable `MboxFilter'.  e.g. `MboxFilter=bogofilter -p -M -I'
+  directs that the bogofilter command be invoked when retrieving mails
+  from mbox file (/var/mail/$USER).
+* New imput option `--msgiduser'.
+* im* commands accept `--version'.
+
 		Differences between IM146 and IM145
 
 * Fix that TCP transaction fails with Perl 5.8.1.
diff --git a/img/dist/IM/00readme b/img/dist/IM/00readme
index 23af8324..38ef9961 100644
--- a/img/dist/IM/00readme
+++ b/img/dist/IM/00readme
@@ -3,7 +3,7 @@
 			    Kazu Yamamoto
 			  Tatsuya Kinoshita
 
-			     Mar 22, 2003
+			     Jul  4, 2004
 
 
 			   <<<Copyright>>>
@@ -99,7 +99,7 @@ You can contact the current maintainer (Tatsuya Kinoshita, since
 October 2002) by this e-mail address.
 
 For the latest news of IM, please see "IM (Internet Message) Official
-Site" (http://tats.iris.ne.jp/im/).
+Site" (http://tats.hauN.jp/im/).
 
 
 			  <<<Programmers>>>
diff --git a/img/dist/IM/IM/Address.pm b/img/dist/IM/IM/Address.pm
index 06524365..b6e309e4 100644
--- a/img/dist/IM/IM/Address.pm
+++ b/img/dist/IM/IM/Address.pm
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::Address.pm version 20031028(IM146)";
diff --git a/img/dist/IM/IM/Alias.pm b/img/dist/IM/IM/Alias.pm
index f8725e20..6b04634a 100644
--- a/img/dist/IM/IM/Alias.pm
+++ b/img/dist/IM/IM/Alias.pm
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::Alias.pm version 20031028(IM146)";
diff --git a/img/dist/IM/IM/Config.pm.in b/img/dist/IM/IM/Config.pm.in
index 4e2f8507..10f55106 100644
--- a/img/dist/IM/IM/Config.pm.in
+++ b/img/dist/IM/IM/Config.pm.in
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::Config.pm version 20031028(IM146)";
@@ -37,7 +37,7 @@ use vars qw(@ISA @EXPORT);
     context_file getchksbr_file getsbr_file scansbr_file scan_header_pick
     address addresses_regex
     msgdbfile msgdbtype
-    mbox_style
+    mbox_style mbox_filter
     nntpservers nntphistoryfile nntpauthuser set_nntpauthuser
     popaccount pophistoryfile imapaccount httpproxy noproxy
     usepwagent pwagentport pwagent_tmp_dir pwagent_tmp_path usepwfiles pwfiles
@@ -127,7 +127,8 @@ BEGIN {
     'getsbr;s;;GetSbrFile'		=> 'Get hook subroutine script',
     'scansbr;s;;ScanSbrFile'		=> 'Scan hook subroutine script',
     'scanheaderpick;s;;ScanHeaderPick'  => 'Scan headers to pick up',
-    'mboxstyle;s;;MBoxStyle'		=> 'Style of local MBox format',
+    'mboxstyle;s;;MBoxStyle'		=> 'Style of local mailbox format',
+    'mboxfilter;s;;MboxFilter'		=> 'Filter for mbox file',
     'nntpservers;s;;NNTPservers'	=> 'List of NNTP servers',
     'nntphistory;s;;NNTPhistory'	=> 'Status file of NNTP access',
     'nntpauthuser;s;;NNTPauthuser'	=> 'User name for NNTP authentication',
@@ -873,6 +874,10 @@ sub mbox_style() {
     return $MBoxStyle;
 }
 
+sub mbox_filter() {
+    return $MboxFilter;
+}
+
 sub nntpservers() {
     return $NNTPservers;
 }
@@ -1150,7 +1155,7 @@ addrbook_file aliases_file petname_file mail_folders_file
 context_file getchksbr_file getsbr_file scansbr_file scan_header_pick
 address addresses_regex
 msgdbfile msgdbtype
-mbox_style
+mbox_style mbox_filter
 nntpservers nntphistoryfile nntpauthuser set_nntpauthuser
 popaccount pophistoryfile imapaccount httpproxy noproxy
 usepwagent pwagentport pwagent_tmp_dir pwagent_tmp_path usepwfiles pwfiles
diff --git a/img/dist/IM/IM/EncDec.pm b/img/dist/IM/IM/EncDec.pm
index c01433a0..ac4560a6 100644
--- a/img/dist/IM/IM/EncDec.pm
+++ b/img/dist/IM/IM/EncDec.pm
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::EncDec.pm version 20031028(IM146)";
diff --git a/img/dist/IM/IM/File.pm b/img/dist/IM/IM/File.pm
index 384c4434..c7bfd00d 100644
--- a/img/dist/IM/IM/File.pm
+++ b/img/dist/IM/IM/File.pm
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Jul  7, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::File.pm version 20031028(IM146)";
diff --git a/img/dist/IM/IM/Folder.pm b/img/dist/IM/IM/Folder.pm
index 9f3a746f..b55a220b 100644
--- a/img/dist/IM/IM/Folder.pm
+++ b/img/dist/IM/IM/Folder.pm
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::Folder.pm version 20031028(IM146)";
diff --git a/img/dist/IM/IM/GetPass.pm b/img/dist/IM/IM/GetPass.pm
index 662577ec..7f2df60c 100644
--- a/img/dist/IM/IM/GetPass.pm
+++ b/img/dist/IM/IM/GetPass.pm
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 30, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::GetPass.pm version 20031028(IM146)";
diff --git a/img/dist/IM/IM/Grep.pm b/img/dist/IM/IM/Grep.pm
index 72da001f..072f80b1 100644
--- a/img/dist/IM/IM/Grep.pm
+++ b/img/dist/IM/IM/Grep.pm
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Nov 03, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::Grep.pm version 20031028(IM146)";
diff --git a/img/dist/IM/IM/History.pm b/img/dist/IM/IM/History.pm
index 13eb2b27..84586902 100644
--- a/img/dist/IM/IM/History.pm
+++ b/img/dist/IM/IM/History.pm
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Jul 6, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::History.pm version 20031028(IM146)";
diff --git a/img/dist/IM/IM/Http.pm b/img/dist/IM/IM/Http.pm
index 4686bf55..af619bee 100644
--- a/img/dist/IM/IM/Http.pm
+++ b/img/dist/IM/IM/Http.pm
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::Http.pm version 20031028(IM146)";
diff --git a/img/dist/IM/IM/Imap.pm b/img/dist/IM/IM/Imap.pm
index 941c1583..5ceedfce 100644
--- a/img/dist/IM/IM/Imap.pm
+++ b/img/dist/IM/IM/Imap.pm
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::Imap.pm version 20031028(IM146)";
@@ -157,10 +157,10 @@ sub imap_select($$$) {
     my($seq) = $ImapSeq++;
     my($resp, @field);
     if ($select) {
-	im_notice("select mbox $mbox and getting number of message.\n");
+	im_notice("select mailbox $mbox and getting number of message.\n");
 	$resp = &send_command($HANDLE, "im$seq SELECT $mbox", '');
     } else {
-	im_notice("examine mbox $mbox and getting number of message.\n");
+	im_notice("examine mailbox $mbox and getting number of message.\n");
 	$resp = &send_command($HANDLE, "im$seq EXAMINE $mbox", '');
     }
     my $msgs = -1;
@@ -584,7 +584,7 @@ sub imap_get_msg($$$$$) {
     }
 }
 
-# IMAP folder (--src=imap[%folder][//auth][:user][@server[/port]])
+# IMAP folder (--src=imap[/auth|%folder[//auth]][:user][@server[/port]])
 sub imap_spec($) {
     my $spec = shift;
 
diff --git a/img/dist/IM/IM/Iso2022jp.pm b/img/dist/IM/IM/Iso2022jp.pm
index e6992a5e..d5583302 100644
--- a/img/dist/IM/IM/Iso2022jp.pm
+++ b/img/dist/IM/IM/Iso2022jp.pm
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::Iso2022jp.pm version 20031028(IM146)";
diff --git a/img/dist/IM/IM/Japanese.pm b/img/dist/IM/IM/Japanese.pm
index 84055d5f..67cd4ab8 100644
--- a/img/dist/IM/IM/Japanese.pm
+++ b/img/dist/IM/IM/Japanese.pm
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::Japanese.pm version 20031028(IM146)";
diff --git a/img/dist/IM/IM/LocalMbox.pm b/img/dist/IM/IM/LocalMbox.pm
index 70b80e13..598e8d72 100644
--- a/img/dist/IM/IM/LocalMbox.pm
+++ b/img/dist/IM/IM/LocalMbox.pm
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::LocalMbox.pm version 20031028(IM146)";
@@ -314,7 +314,7 @@ sub process_file($$$$) {
     my($format, $msgs, $rp, $length, $inheader, @Message);
     local(*MBOX);
 
-    im_notice("opening MBOX ($mbox)\n");
+    im_notice("opening file ($mbox)\n");
     unless (im_open(\*MBOX, "<$mbox")) {
 	# XXX not found or unreadable...
 	return -1;
@@ -346,13 +346,37 @@ sub process_mbox($$$$$) {
     my($format, $msgs, $length, $inheader, @Message);
     local(*MBOX);
     my($first_line, $FIRST_LINE);
+    my($mbox_filter);
 
-    im_info("Getting new messages from local mailbox into $dst...\n")
-	if ($how eq 'get');
-    im_warn("opening MBOX ($mbox)\n") if (&verbose);
-    unless (im_open(\*MBOX, "<$mbox")) {
-	# XXX not found or unreadable...
-	return -1;
+    if ($how eq 'get') {
+	im_info("Getting new messages from local mailbox into $dst...\n");
+    }
+    $mbox_filter = &mbox_filter();
+    if ($mbox_filter ne '') {
+	if ($mbox_filter =~ /(.+)/) {
+	    if ($main::INSECURE) {
+		im_warn("Sorry, MboxFilter is ignored for SUID root script.\n");
+		$mbox_filter = '';
+	    } else {
+		if ($> != 0) {
+		    $mbox_filter = $1; # to pass through taint check
+		}
+		im_warn("opening MBOX ($mbox_filter $mbox)\n") if (&verbose);
+		unless (im_open(\*MBOX, "$mbox_filter $mbox |")) {
+		    im_err("MboxFilter failed ($!).\n");
+		    return -1;
+		}
+	    }
+	} else {
+	    $mbox_filter = '';
+	}
+    }
+    if ($mbox_filter eq '') {
+	im_warn("opening MBOX ($mbox)\n") if (&verbose);
+	unless (im_open(\*MBOX, "<$mbox")) {
+	    # XXX not found or unreadable...
+	    return -1;
+	}
     }
     chomp($first_line = <MBOX>);
     if ($first_line =~ /^From /) {
@@ -547,7 +571,7 @@ sub local_lockmbox($$) {
     if ($type =~ /file/) {
 #	while (!sysopen(LOCK, "$base.lock", O_RDWR()|O_CREAT()|O_EXCL())) {
 #	    if ($retry >= 10) {
-#		im_warn("can't create $base.lock: $!\n");
+#		im_warn("can't create $base.lock ($!).\n");
 #		return -1;
 #	    }
 #	    im_warn("mailbox is processed by another process, waiting...\n")
@@ -557,7 +581,7 @@ sub local_lockmbox($$) {
 #	}
 
 	unless (im_open(\*LOCKFILE, ">$base.$$")) {
-	    im_warn("can't create lock file $base.$$: $!\n");
+	    im_warn("can't create lock file $base.$$ ($!).\n");
 	    im_warn("use 'flock' instead of 'file' if possible.\n");
 	    return -1;
 	}
@@ -565,7 +589,7 @@ sub local_lockmbox($$) {
 	close(LOCKFILE);
 	while (!link("$base.$$", "$base.lock")) {
 	    if ($retry >= 10) {
-		im_warn("can't create $base.lock: $!\n");
+		im_warn("can't create $base.lock ($!).\n");
 		unlink("$base.$$");
 		return -1;
 	    }
@@ -579,12 +603,12 @@ sub local_lockmbox($$) {
     }
     if ($type =~ /flock/) {
 	unless (im_open(\*LOCK_FH, "+<$base")) {
-	    im_err "can't open $base :$!\n";
+	    im_err "can't open $base ($!).\n";
 	    return -1;
 	}
 	if (! &win95p) {
 	unless (flock (LOCK_FH, LOCK_EX|LOCK_NB)) {
-	    im_warn "can't flock $base: $!\n";
+	    im_warn "can't flock $base ($!).\n";
 	    return -1;
 	}
 	}
@@ -599,7 +623,7 @@ sub local_unlockmbox($) {
     im_debug("removing lock file with uid=$> gid=$)\n") if (&debug('local'));
     if ($locked_by_file) {
 	if (-f "$base.lock" && unlink("$base.lock") <= 0) {
-	    im_warn("can't unlink lock file $base.lock: $!\n");
+	    im_warn("can't unlink lock file $base.lock ($!).\n");
 	    $rcode = -1;
 	}
 	$locked_by_file = 0;
diff --git a/img/dist/IM/IM/Log.pm b/img/dist/IM/IM/Log.pm
index b45f4d21..5c3b6ffa 100644
--- a/img/dist/IM/IM/Log.pm
+++ b/img/dist/IM/IM/Log.pm
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::Log.pm version 20031028(IM146)";
diff --git a/img/dist/IM/IM/MD5.pm b/img/dist/IM/IM/MD5.pm
index d7d3d8cc..5817992f 100644
--- a/img/dist/IM/IM/MD5.pm
+++ b/img/dist/IM/IM/MD5.pm
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::MD5.pm version 20031028(IM146)";
diff --git a/img/dist/IM/IM/Message.pm b/img/dist/IM/IM/Message.pm
index cbfbf544..38eb2d10 100644
--- a/img/dist/IM/IM/Message.pm
+++ b/img/dist/IM/IM/Message.pm
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::Message.pm version 20031028(IM146)";
@@ -735,14 +735,8 @@ sub gen_message_id($) {
     if ($main::Message_id_PID) {
 	$mid_rnd = "-".$$.$mid_rnd;
     }
-    my $mid_user;
-    if ($main::Message_id_UID) {
-	$mid_user = $<;
-    } else {
-	$mid_user = $main::Login;
-    }
     my($mid)
-      = "<$mid_time$mid_rnd.$mid_user\@$main::Message_id_domain_name>";
+      = "<$mid_time$mid_rnd.$main::Message_id_user_name\@$main::Message_id_domain_name>";
     $Mid_hist{$part} = $mid if ($part > 0);
     return $mid;
 }
diff --git a/img/dist/IM/IM/MsgStore.pm b/img/dist/IM/IM/MsgStore.pm
index 939ffbea..49aa728e 100644
--- a/img/dist/IM/IM/MsgStore.pm
+++ b/img/dist/IM/IM/MsgStore.pm
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::MsgStore.pm version 20031028(IM146)";
diff --git a/img/dist/IM/IM/Nntp.pm b/img/dist/IM/IM/Nntp.pm
index 87bfea19..94a82cc9 100644
--- a/img/dist/IM/IM/Nntp.pm
+++ b/img/dist/IM/IM/Nntp.pm
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::Nntp.pm version 20031028(IM146)";
diff --git a/img/dist/IM/IM/Pop.pm b/img/dist/IM/IM/Pop.pm
index 0892a2ab..c321f1ac 100644
--- a/img/dist/IM/IM/Pop.pm
+++ b/img/dist/IM/IM/Pop.pm
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::Pop.pm version 20031028(IM146)";
diff --git a/img/dist/IM/IM/Recipient.pm b/img/dist/IM/IM/Recipient.pm
index 583d7016..2ad56275 100644
--- a/img/dist/IM/IM/Recipient.pm
+++ b/img/dist/IM/IM/Recipient.pm
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 27, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::Recipient.pm version 20031028(IM146)";
diff --git a/img/dist/IM/IM/Scan.pm b/img/dist/IM/IM/Scan.pm
index deb2dbd9..5cc2ca2e 100644
--- a/img/dist/IM/IM/Scan.pm
+++ b/img/dist/IM/IM/Scan.pm
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::Scan.pm version 20031028(IM146)";
diff --git a/img/dist/IM/IM/Smtp.pm b/img/dist/IM/IM/Smtp.pm
index 2839b5c1..0478e9a5 100644
--- a/img/dist/IM/IM/Smtp.pm
+++ b/img/dist/IM/IM/Smtp.pm
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::Smtp.pm version 20031028(IM146)";
diff --git a/img/dist/IM/IM/Ssh.pm b/img/dist/IM/IM/Ssh.pm
index cc411d11..f430e266 100644
--- a/img/dist/IM/IM/Ssh.pm
+++ b/img/dist/IM/IM/Ssh.pm
@@ -6,7 +6,7 @@
 ### Author:  Masatoshi Tsuchiya <tsuchiya@pine.kuee.kyoto-u.ac.jp>
 ###	Internet Message Group <img@mew.org>
 ### Created: Oct 05, 1999
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::Ssh.pm version 20031028(IM146)";
diff --git a/img/dist/IM/IM/Stdio.pm b/img/dist/IM/IM/Stdio.pm
index 6b7be57f..05dab79c 100644
--- a/img/dist/IM/IM/Stdio.pm
+++ b/img/dist/IM/IM/Stdio.pm
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: May 7, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::Stdio.pm version 20031028(IM146)";
diff --git a/img/dist/IM/IM/TcpTransaction.pm b/img/dist/IM/IM/TcpTransaction.pm
index 0579ac29..06f16178 100644
--- a/img/dist/IM/IM/TcpTransaction.pm
+++ b/img/dist/IM/IM/TcpTransaction.pm
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::TcpTransaction.pm version 20031028(IM146)";
diff --git a/img/dist/IM/IM/Util.pm b/img/dist/IM/IM/Util.pm
index 516a88a2..03d9521e 100644
--- a/img/dist/IM/IM/Util.pm
+++ b/img/dist/IM/IM/Util.pm
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::Util.pm version 20031028(IM146)";
diff --git a/img/dist/IM/cnf.im/SiteConfig.in b/img/dist/IM/cnf.im/SiteConfig.in
index 22a3c1d6..93e6a98d 100644
--- a/img/dist/IM/cnf.im/SiteConfig.in
+++ b/img/dist/IM/cnf.im/SiteConfig.in
@@ -99,8 +99,11 @@ ToDomain=@im_hostname@		# domain when domain part is omitted
 #rpath=append			# conversion of UNIX From into Return-Path:
 #PopHistory=pophist-{POPSERVERID}	# to save last state (relative to ~/.im/)
 #NntpHistory=newshist		# to save last state (relative to ~/.im/)
-#MBoxStyle=qmail			# if folder style mbox of qmail is used
-#Imget.Src=local:${HOME}/Maildir	# in case of qmail
+#MboxFilter=bogofilter -p -M -I	# filter for mbox file
+#MboxFilter=spamoracle mark
+#MBoxFilter=bsfilter --spam-cutoff 0.85 --pipe --insert-flag --mbox 2>/dev/null
+#MBoxStyle=qmail		# in case of qmail (maildir format)
+#Imget.Src=local:${HOME}/Maildir
 UseCL=@im_usecl@		# Use value of Content-Length header
 NoSync=@im_nosync@		# Do not need fsync(2) on writing file
 #FsyncNumber=@im_fsync_no@	# if 0, system call number of fsync is guessed
@@ -113,9 +116,9 @@ NoSync=@im_nosync@		# Do not need fsync(2) on writing file
 #Keep=7				# preserve read messages on server
 #ProtoKeep=UIDL			# how to know which message is unread
 				# (UIDL, LAST, STATUS, MSGID)
-#IgnorePostPet=yes		# leave messages for PostPet on mbox (POP only)
+#IgnorePostPet=yes		# leave messages for PostPet on POP server
 
-#Imget.Src=imap
+#Imget.Src=imap%INBOX
 #ImapAccount=/AUTH@localhost	# account info for IMAP access
 #ImapAccount=/AUTH:user@host	# account info with user name
 #HttpProxy=proxy-server:8080	# proxy server for HTTP access
@@ -146,6 +149,7 @@ NoSync=@im_nosync@		# Do not need fsync(2) on writing file
 #FccDir=$MailDir		# directory for FCC folders
 #QueueDir=queue			# directory for to store messages to be sent
 #UseXDispatcher=yes		# use X-Dispatcher field
+#MsgIdUser=${USER}		# user part for creation of Message-Id:
 #MsgIdDomain=${HOST}		# if you want to use FQDN of dispatching host
 #ObeyMTAdomain=yes		# do not append domainpart to addresses by imput
 #NoMsgIdForNews=yes		# do not insert Message-Id: when posting as news
diff --git a/img/dist/IM/dot.im/Config b/img/dist/IM/dot.im/Config
index a7d0fd4d..ab8b609a 100644
--- a/img/dist/IM/dot.im/Config
+++ b/img/dist/IM/dot.im/Config
@@ -104,8 +104,11 @@ ToDomain=_domain_when_domain_part_is_omitted_
 #rpath=append			# conversion of UNIX From into Return-Path:
 #PopHistory=pophist-{POPSERVERID}	# to save last state (relative to ~/.im/)
 #NntpHistory=newshist		# to save last state (relative to ~/.im/)
-#MBoxStyle=qmail			# if folder style mbox of qmail is used
-#Imget.Src=local:${HOME}/Maildir	# in case of qmail
+#MboxFilter=bogofilter -p -M -I	# filter for mbox file
+#MboxFilter=spamoracle mark
+#MBoxFilter=bsfilter --spam-cutoff 0.85 --pipe --insert-flag --mbox 2>/dev/null
+#MBoxStyle=qmail		# in case of qmail (maildir format)
+#Imget.Src=local:${HOME}/Maildir
 #UseCL=no			# Use value of Content-Length header
 #NoSync=no			# Do not need fsync(2) on writing file
 #FsyncNumber=0			# if 0, system call number of fsync is guessed
@@ -118,9 +121,9 @@ ToDomain=_domain_when_domain_part_is_omitted_
 #Keep=7				# preserve read messages on server
 #ProtoKeep=UIDL			# how to know which message is unread
 				# (UIDL, LAST, STATUS, MSGID)
-#IgnorePostPet=yes		# leave messages for PostPet on mbox (POP only)
+#IgnorePostPet=yes		# leave messages for PostPet on POP server
 
-#Imget.Src=imap
+#Imget.Src=imap%INBOX
 #ImapAccount=/AUTH@localhost	# account info for IMAP access
 #ImapAccount=/AUTH:user@host	# account info with user name
 #HttpProxy=proxy-server:8080	# proxy server for HTTP access
@@ -151,6 +154,7 @@ ToDomain=_domain_when_domain_part_is_omitted_
 #FccDir=$MailDir		# directory for FCC folders
 #QueueDir=queue			# directory for to store messages to be sent
 #UseXDispatcher=yes		# use X-Dispatcher field
+#MsgIdUser=${USER}		# user part for creation of Message-Id:
 #MsgIdDomain=${HOST}		# if you want to use FQDN of dispatching host
 #ObeyMTAdomain=yes		# do not append domainpart to addresses by imput
 #NoMsgIdForNews=yes		# do not insert Message-Id: when posting as news
diff --git a/img/dist/IM/dot.im/get.sbr b/img/dist/IM/dot.im/get.sbr
index 3943631e..b3c59001 100644
--- a/img/dist/IM/dot.im/get.sbr
+++ b/img/dist/IM/dot.im/get.sbr
@@ -36,7 +36,7 @@ sub get_sub ($$$) {
 	    print SEQ "$_: $hash{$_}\n";
 	}
 
-	close (SEQ);
+	close(SEQ);
     }
 }
 
diff --git a/img/dist/IM/dot.im/get.sbr.refile b/img/dist/IM/dot.im/get.sbr.refile
new file mode 100644
index 00000000..b814889c
--- /dev/null
+++ b/img/dist/IM/dot.im/get.sbr.refile
@@ -0,0 +1,73 @@
+# Auto refiling for imget  -*-Perl-*-
+
+use IM::File qw(im_rename);
+
+sub get_sub ($$$) {
+    my($folder, $first, $last) = @_;
+    my($header, $flie, $new_folder, $new_file, $tmp_str, $dir, $msg);
+    my($touch_file, $touch_file_m, $touch_file_n);
+
+    return if ($folder ne &inbox_folder());
+
+    $dir = &expand_path($folder);
+    $touch_file = "$dir/.im_getsbr_touch";
+
+    if (-e $touch_file) {
+	$touch_file_m = -M $touch_file;
+	$touch_file_n = 0;
+	if (open(FH, $touch_file)) {
+	    while (<FH>) {
+		chomp;
+		$touch_file_n = $_;
+	    }
+	    close(FH);
+	}
+	for ($msg = $last; $msg >= $first; $msg--) {
+	    $file = &message_name($folder, $msg);
+	    if (! -e $file) {
+		last;
+	    }
+	    if (-M $file > $touch_file_m) {
+		last;
+	    }
+	    if (-M $file == $touch_file_m && $msg <= $touch_file_n) {
+		last;
+	    }
+	}
+	$first = $msg + 1;
+    }
+
+    for ($msg = $first; $msg <= $last; $msg++) {
+	$file = &message_name($folder, $msg);
+	if (open(MSG, "$file")) {
+	    $tmp_str = $/;
+	    $/ = "\n\n";
+	    $header = <MSG>;
+	    $/ = $tmp_str;
+
+	    $new_folder = $folder;
+	    if ($header =~ /(^|\n)X-Bogosity: Yes/) {
+		$new_folder = '+spam';
+	    } elsif ($header =~ /(^|\n)X-Spam-Flag: Yes/) {
+		$new_folder = '+spam';
+	    } elsif ($header =~ /(^|\n)X-Spam: yes/) {
+		$new_folder = '+spam';
+#	    } elsif ($header =~ /(^|\n)X-ML-Name: mew-dist/) {
+#		$new_folder = '+mew-dist';
+	    }
+	    if ($new_folder ne $folder) {
+		$new_file = &message_name($new_folder, 'new') || die $!;
+		&im_notice("refiling $folder/$msg to $new_folder.\n");
+		&im_rename($file, $new_file) || die $!;
+	    }
+	    close(MSG);
+	}
+    }
+
+    if (open(FH, ">$touch_file")) {
+	print FH "$last\n";
+	close(FH);
+    }
+}
+
+1;
diff --git a/img/dist/IM/imali.in b/img/dist/IM/imali.in
index a439906f..edb1015d 100644
--- a/img/dist/IM/imali.in
+++ b/img/dist/IM/imali.in
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 BEGIN {
@@ -13,9 +13,15 @@ BEGIN {
     @im_src_siteperl@
 };
 
-my $VERSION = "imali version 20031028(IM146)";
-
 $Prog = 'imali';
+my $VERSION_DATE = "20040704";
+my $VERSION_NUMBER = "147";
+my $VERSION = "${Prog} version ${VERSION_DATE}(IM${VERSION_NUMBER})";
+my $VERSION_INFORMATION = "${Prog} (IM ${VERSION_NUMBER}) ${VERSION_DATE}
+Copyright (C) 1999 IM developing team
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+";
 
 ##
 ## Require packages
@@ -28,7 +34,7 @@ use integer;
 use strict;
 use vars qw($Prog $EXPLANATION @OptConfig
 	    $opt_host $opt_file $opt_addrbook
-	    $opt_verbose $opt_debug $opt_help);
+	    $opt_verbose $opt_debug $opt_help $opt_version);
 
 ##
 ## Environments
@@ -41,12 +47,13 @@ Usage: $Prog [OPTIONS] [TARGETS...]
 ";
 
 @OptConfig = (
-    'host,H;b;;'  => "Lookup hosts alias file.",
-    'file;s;;'    => "Set aliases file.",
-    'addrbook;s;;'    => "Set Addrbook file.",
-    'verbose;b;;' => 'With verbose messages.',
-    'debug;d;;'   => "With debug message.",
-    'help;b;;'    => "Show this message.",
+    'host,H;b;;'  => "Lookup hosts alias file",
+    'file;s;;'    => "Set aliases file",
+    'addrbook;s;;'    => "Set Addrbook file",
+    'verbose;b;;' => 'With verbose messages',
+    'debug;d;;'   => "With debug message",
+    'help;b;;'    => "Display this help and exit",
+    'version,V;b;;' => "Output version information and exit",
     );
 
 ##
@@ -56,8 +63,8 @@ Usage: $Prog [OPTIONS] [TARGETS...]
 init_opt(\@OptConfig);
 read_cfg();
 read_opt(\@ARGV); # help?
+print("${VERSION_INFORMATION}") && exit $EXIT_SUCCESS if $opt_version;
 help($EXPLANATION) && exit $EXIT_SUCCESS if $opt_help;
-
 debug_option($opt_debug) if $opt_debug;
 
 ##
@@ -148,6 +155,10 @@ Print debug messages when running.
 
 Display help message and exit.
 
+=item I<--version>
+
+Output version information and exit.
+
 =back
 
 =head1 COPYRIGHT
diff --git a/img/dist/IM/imcat.in b/img/dist/IM/imcat.in
index 65aba355..d89b5789 100644
--- a/img/dist/IM/imcat.in
+++ b/img/dist/IM/imcat.in
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: May  5, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 BEGIN {
@@ -13,9 +13,15 @@ BEGIN {
     @im_src_siteperl@
 };
 
-my $VERSION = "imcat version 20031028(IM146)";
-
 $Prog = 'imcat';
+my $VERSION_DATE = "20040704";
+my $VERSION_NUMBER = "147";
+my $VERSION = "${Prog} version ${VERSION_DATE}(IM${VERSION_NUMBER})";
+my $VERSION_INFORMATION = "${Prog} (IM ${VERSION_NUMBER}) ${VERSION_DATE}
+Copyright (C) 1999 IM developing team
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+";
 
 ##
 ## Require packages
@@ -28,7 +34,7 @@ use strict;
 use vars qw($Prog $EXPLANATION @EnvConfig @OptConfig
 	    @servers
 	    $opt_src $opt_join $opt_boundary
-	    $opt_verbose $opt_debug $opt_help);
+	    $opt_verbose $opt_debug $opt_help $opt_version);
 
 ##
 ## Environments
@@ -45,14 +51,15 @@ Usage: $Prog [OPTIONS] [FOLDER] MSG
      );
 
 @OptConfig = (
-    'src;F;;'      => "Folder.",
-    'join;b;;'     => "join partial messages.",
-    'boundary;b;;' => "Print start boundary for Mew.",
+    'src;F;;'      => "Folder",
+    'join;b;;'     => "join partial messages",
+    'boundary;b;;' => "Print start boundary for Mew",
     'SSHServer,S;s;localhost;SSH_server'
-                       => 'SSH port relay server.',
-    'verbose;b;;'  => 'With verbose messages.',
-    'debug;d;;'    => "With debug message.",
-    'help;b;;'     => "Show this message.",
+                       => 'SSH port relay server',
+    'verbose;b;;'  => 'With verbose messages',
+    'debug;d;;'    => "With debug message",
+    'help;b;;'     => "Display this help and exit",
+    'version,V;b;;'  => "Output version information and exit",
     );
 
 ##
@@ -63,8 +70,8 @@ init_opt(\@OptConfig);
 read_env(\@EnvConfig);
 read_cfg();
 read_opt(\@ARGV); # help?
+print("${VERSION_INFORMATION}") && exit $EXIT_SUCCESS if $opt_version;
 help($EXPLANATION) && exit $EXIT_SUCCESS if $opt_help;
-
 debug_option($opt_debug) if $opt_debug;
 
 ##
@@ -409,6 +416,10 @@ Print debug messages when running.
 
 Display help message and exit.
 
+=item I<--version>
+
+Output version information and exit.
+
 =back
 
 =head1 COPYRIGHT
diff --git a/img/dist/IM/imcd.in b/img/dist/IM/imcd.in
index 2e443db8..2d4748bd 100644
--- a/img/dist/IM/imcd.in
+++ b/img/dist/IM/imcd.in
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 BEGIN {
@@ -13,9 +13,15 @@ BEGIN {
     @im_src_siteperl@
 };
 
-my $VERSION = "imcd version 20031028(IM146)";
-
 $Prog = 'imcd';
+my $VERSION_DATE = "20040704";
+my $VERSION_NUMBER = "147";
+my $VERSION = "${Prog} version ${VERSION_DATE}(IM${VERSION_NUMBER})";
+my $VERSION_INFORMATION = "${Prog} (IM ${VERSION_NUMBER}) ${VERSION_DATE}
+Copyright (C) 1999 IM developing team
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+";
 
 ##
 ## Require packages
@@ -27,7 +33,7 @@ use IM::Util;
 use integer;
 use strict;
 use vars qw($Prog $EXPLANATION @OptConfig
-	    $opt_src $opt_quiet $opt_verbose $opt_debug $opt_help);
+	    $opt_src $opt_quiet $opt_verbose $opt_debug $opt_help $opt_version);
 
 ##
 ## Environments
@@ -40,11 +46,12 @@ Usage: $Prog [OPTIONS] [FOLDER]
 ";
 
 @OptConfig = (
-    'src;F;;'     => "Set source folder.",
-    'quiet;b;;'   => "Do not bark.",
-    'verbose;b;;' => 'With verbose messages.',
-    'debug;d;;'   => "With debug message.",
-    'help;b;;'    => "Show this message.",
+    'src;F;;'     => "Set source folder",
+    'quiet;b;;'   => "Do not bark",
+    'verbose;b;;' => 'With verbose messages',
+    'debug;d;;'   => "With debug message",
+    'help;b;;'    => "Display this help and exit",
+    'version,V;b;;' => "Output version information and exit",
     );
 
 ##
@@ -54,8 +61,8 @@ Usage: $Prog [OPTIONS] [FOLDER]
 init_opt(\@OptConfig);
 read_cfg();
 read_opt(\@ARGV); # help?
+print("${VERSION_INFORMATION}") && exit $EXIT_SUCCESS if $opt_version;
 help($EXPLANATION) && exit $EXIT_SUCCESS if $opt_help;
-
 debug_option($opt_debug) if $opt_debug;
 
 ##
@@ -115,6 +122,10 @@ Print debug messages when running.
 
 Display help message and exit.
 
+=item I<--version>
+
+Output version information and exit.
+
 =back
 
 =head1 FILES
diff --git a/img/dist/IM/imclean.in b/img/dist/IM/imclean.in
index b0b4b34b..434be547 100644
--- a/img/dist/IM/imclean.in
+++ b/img/dist/IM/imclean.in
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 BEGIN {
@@ -13,9 +13,15 @@ BEGIN {
     @im_src_siteperl@
 };
 
-my $VERSION = "imclean version 20031028(IM146)";
-
 $Prog = 'imclean';
+my $VERSION_DATE = "20040704";
+my $VERSION_NUMBER = "147";
+my $VERSION = "${Prog} version ${VERSION_DATE}(IM${VERSION_NUMBER})";
+my $VERSION_INFORMATION = "${Prog} (IM ${VERSION_NUMBER}) ${VERSION_DATE}
+Copyright (C) 1999 IM developing team
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+";
 
 ##
 ## Require packages
@@ -28,7 +34,8 @@ use IM::File;
 use integer;
 use strict;
 use vars qw($Prog $EXPLANATION @OptConfig
-	    $opt_src $opt_noharm $opt_quiet $opt_verbose $opt_debug $opt_help);
+	    $opt_src $opt_noharm $opt_quiet $opt_verbose
+	    $opt_debug $opt_help $opt_version);
 
 ##
 ## Environments
@@ -41,14 +48,15 @@ Usage: $Prog [OPTIONS] [FOLDER] [MSGS...]
 ";
 
 @OptConfig = (
-    'src;F;;'     => "Set a folder to be cleaned up.",
+    'src;F;;'     => "Set a folder to be cleaned up",
     'SSHServer,S;s;localhost;SSH_server'
-                       => 'SSH port relay server.',
-    'noharm;b;;'  => "Do not delete files, show what will be performed.",
-    'quiet;b;;'   => "Do not show any messages.",
-    'verbose;b;;' => 'With verbose messages.',
-    'debug;d;;'   => "With debug message.",
-    'help;b;;'    => "Show this message.",
+                       => 'SSH port relay server',
+    'noharm;b;;'  => "Do not delete files, show what will be performed",
+    'quiet;b;;'   => "Do not show any messages",
+    'verbose;b;;' => 'With verbose messages',
+    'debug;d;;'   => "With debug message",
+    'help;b;;'    => "Display this help and exit",
+    'version,V;b;;' => "Output version information and exit",
     );
 
 ##
@@ -58,8 +66,8 @@ Usage: $Prog [OPTIONS] [FOLDER] [MSGS...]
 init_opt(\@OptConfig);
 read_cfg();
 read_opt(\@ARGV); # help?
+print("${VERSION_INFORMATION}") && exit $EXIT_SUCCESS if $opt_version;
 help($EXPLANATION) && exit $EXIT_SUCCESS if $opt_help;
-
 debug_option($opt_debug) if $opt_debug;
 
 ##
@@ -200,6 +208,10 @@ Print debug messages when running.
 
 Display help message and exit.
 
+=item I<--version>
+
+Output version information and exit.
+
 =back
 
 =head1 COPYRIGHT
diff --git a/img/dist/IM/imget.in b/img/dist/IM/imget.in
index eb5705c0..3966adeb 100644
--- a/img/dist/IM/imget.in
+++ b/img/dist/IM/imget.in
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Jan 14, 1996
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 BEGIN {
@@ -13,9 +13,15 @@ BEGIN {
     @im_src_siteperl@
 };
 
-my $VERSION = "imget version 20031028(IM146)";
-
 $Prog = 'imget';
+my $VERSION_DATE = "20040704";
+my $VERSION_NUMBER = "147";
+my $VERSION = "${Prog} version ${VERSION_DATE}(IM${VERSION_NUMBER})";
+my $VERSION_INFORMATION = "${Prog} (IM ${VERSION_NUMBER}) ${VERSION_DATE}
+Copyright (C) 1999 IM developing team
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+";
 
 ##
 ## Require packages
@@ -31,8 +37,8 @@ use vars qw($Prog $EXPLANATION @EnvConfig @OptConfig
 	    $INSECURE $SUIDROOT
 	    $opt_quiet $opt_noscan $opt_scaninboxonly $opt_form $opt_jissafe
 	    $opt_width $opt_lock $opt_count $opt_keep $opt_protokeep $opt_src
-	    $opt_dst $opt_mode $opt_assoc $opt_verbose $opt_debug $opt_help
-	    $opt_buffer);
+	    $opt_dst $opt_mode $opt_assoc $opt_verbose $opt_buffer
+	    $opt_debug $opt_help $opt_version);
 
 ##
 ## Environments
@@ -52,43 +58,45 @@ Usage: $Prog [OPTIONS]
 
 @OptConfig = (
     'src;s;;' =>
-	"Message source: 'local[:path_of_mbox]'\n" .
+	"Message source: 'local[:path_of_mailbox]'\n" .
 	"\t\t\t\t'pop[/APOP|/RPOP|/POP][:user][\@host]'\n" .
 	"\t\t\t\t'imap[/AUTH|/LOGIN][:user][\@host]'\n" .
+	"\t\t\t\t'imap%folder[//AUTH|//LOGIN][:user][\@host]'\n" .
 	"\t\t\t\t'nntp:group[\@host]' or\n" .
 	"\t\t\t\t'stdin'" ,
     'dst;s;;'    =>
-	'Message destination: "+folder" or "=locally.saved.news".',
-    'noscan;b;;'       => 'No scan listings.',
-    'scaninboxonly,o;b;;'=> 'Do not show scanned-lines if InboxFolder != dst.',
+	'Message destination: "+folder" or "=locally.saved.news"',
+    'noscan;b;;'       => 'No scan listings',
+    'scaninboxonly,o;b;;'=> 'Do not show scanned-lines if InboxFolder != dst',
     'form;s;;'	       => 'Scan format',
     'buffer;B;;'       => 'Make output data buffered',
     'jissafe;b;;'      => 'Safe manner for JIS',
-    'width;i;;'        => 'Width of result for scan listings.',
+    'width;i;;'        => 'Width of result for scan listings',
 #   'thread;b;;'       => 'Make threads',
 #   'indent;i;;'       => "Width of thread indent",
     'lock;s;flock;'    => 'Local mailbox locking style. (none,flock,file)',
     'rpath;s;append;'  => "Conversion of UNIX From line into Return-Path:\n" .
 	"\t\t(append, ignore, replace)",
-    'keep;i;0;'        => "Preserve messages.\n" .
+    'keep;i;0;'        => "Preserve messages\n" .
 	"\t\t(POP: in days; 0=delete immediately, -1=preserve forever)\n" .
 	"\t\t(otherwise: 0=delete immediately, non0=preserve forever)",
-    'protokeep;s;UIDL;'=> "Protocol type to use for keeping messages on POP.\n".
+    'protokeep;s;UIDL;'=> "Protocol type to use for keeping messages on POP\n".
 	"\t\t(UIDL, LAST, STATUS, MSGID)\n" .
-	"\t\tTimed out deletion is not supported with LAST.",
+	"\t\tTimed out deletion is not supported with LAST",
     'usecl;b;;Obey_CL' => "Use value of Content-Length header for delimitation".
-	".\n\t\t(effective only if source of messages is local)." ,
+	"\n\t\t(effective only if source of messages is local)" ,
     'count;i;;'        => 'Number of messages to be gotten in a process (NNTP)',
-    'mode;s;get;'      => 'Processing mode: "get", "from" or "check".',
+    'mode;s;get;'      => 'Processing mode: "get", "from" or "check"',
     'assoc;s;;'        => "Association list: dst1=src1;dst2=src2;...\n" .
-	"\t\tThis overrides --dst and --src options.",
+	"\t\tThis overrides --dst and --src options",
     'mimedecodequoted,x;b;;' => 'Decode broken mime-encoded strings',
     'SSHServer,S;s;localhost;SSH_server'
-		       => 'SSH port relay server.',
-    'quiet;b;;'        => 'Suppress informational messages.',
-    'verbose;b;;'      => 'With verbose messages.',
-    'debug;d;;'        => "With debug message.",
-    'help;b;;'         => 'Display this help message.',
+		       => 'SSH port relay server',
+    'quiet;b;;'        => 'Suppress informational messages',
+    'verbose;b;;'      => 'With verbose messages',
+    'debug;d;;'        => "With debug message",
+    'help;b;;'         => "Display this help and exit",
+    'version,V;b;;'      => "Output version information and exit",
     );
 
 ##
@@ -130,8 +138,8 @@ my $cnf_src = $opt_src; $opt_src = '';
 my $cnf_dst = $opt_dst; $opt_dst = '';
 my $cnf_assoc = $opt_assoc; $opt_assoc = '';
 read_opt(\@ARGV); # help?
+print("${VERSION_INFORMATION}") && exit $EXIT_SUCCESS if $opt_version;
 help($EXPLANATION) && exit $EXIT_SUCCESS if $opt_help;
-
 debug_option($opt_debug) if $opt_debug;
 
 ##
@@ -257,9 +265,9 @@ This command is provided by IM (Internet Message).
 
 =item I<-s, --src=STRING>
 
-Message source: 'local[:path_of_mbox]',
+Message source: 'local[:path_of_mailbox]',
 'pop[/APOP|/RPOP|/POP][:user][@host]',
-'imap[/AUTH|/LOGIN][:user][@host]',
+'imap[[/AUTH|/LOGIN]|%folder[//AUTH|//LOGIN]][:user][@host]',
 'nntp:group[@host]', or
 'stdin'.
 
@@ -358,6 +366,10 @@ Print debug messages when running.
 
 Display help message and exit.
 
+=item I<--version>
+
+Output version information and exit.
+
 =back
 
 =head1 COPYRIGHT
diff --git a/img/dist/IM/imgrep.in b/img/dist/IM/imgrep.in
index 609c7849..97781da4 100644
--- a/img/dist/IM/imgrep.in
+++ b/img/dist/IM/imgrep.in
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 BEGIN {
@@ -13,9 +13,15 @@ BEGIN {
     @im_src_siteperl@
 };
 
-my $VERSION = "imgrep version 20031028(IM146)";
-
 $Prog = 'imgrep';
+my $VERSION_DATE = "20040704";
+my $VERSION_NUMBER = "147";
+my $VERSION = "${Prog} version ${VERSION_DATE}(IM${VERSION_NUMBER})";
+my $VERSION_INFORMATION = "${Prog} (IM ${VERSION_NUMBER}) ${VERSION_DATE}
+Copyright (C) 1999 IM developing team
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+";
 
 ##
 ## Require packages
@@ -30,7 +36,7 @@ use strict;
 use vars qw($Prog $EXPLANATION @OptConfig
 	    $opt_format @opt_src $opt_casefold $opt_expression
 	    $opt_delimiter $opt_dupchecktarget $opt_verbose $opt_debug
-	    $opt_quiet $opt_help);
+	    $opt_quiet $opt_help $opt_version);
 
 ##
 ## Environments
@@ -61,7 +67,7 @@ Usage: $Prog [OPTIONS] [FOLDER] [RANGE]
 	"\n\t\t(default: \"number\" for single target folder".
 	"\n\t\t	     \"path\" for multiple target folders)",
     'casefold;b;on;' => 'Case sensitivity'.
-	"\n\t\t(This option affects both fieldname and pattern.)",
+	"\n\t\t(This option affects both fieldname and pattern)",
     'expression;s;;' => 'Search expression:'.
 	"\n\n\t\tUsable keyword".
         "\n\t\t\t& &&		     logical AND".
@@ -75,10 +81,11 @@ Usage: $Prog [OPTIONS] [FOLDER] [RANGE]
         "\n\t\t\tall	     Entire message",
     'delimiter;s;\n\n|\n----\n;' => 'Mail header delimiter',
     'dupchecktarget,D;s;none;' => 'Duplicate Check Target',
-    'quiet;b;;'   => 'Suppress informational messages.',
-    'verbose;b;;' => 'With diagnostic messages.',
-    'debug;d;;'   => 'With debug messages.',
-    'help;b;;'    => 'Show this messages.',
+    'quiet;b;;'   => 'Suppress informational messages',
+    'verbose;b;;' => 'With diagnostic messages',
+    'debug;d;;'   => 'With debug messages',
+    'help;b;;'    => "Display this help and exit",
+    'version,V;b;;' => "Output version information and exit",
     );
 
 ##
@@ -88,8 +95,8 @@ Usage: $Prog [OPTIONS] [FOLDER] [RANGE]
 init_opt(\@OptConfig);
 read_cfg();
 read_opt(\@ARGV); # help?
+print("${VERSION_INFORMATION}") && exit $EXIT_SUCCESS if $opt_version;
 help($EXPLANATION) && exit $EXIT_SUCCESS if $opt_help;
-
 debug_option($opt_debug) if $opt_debug;
 
 ##
@@ -257,6 +264,10 @@ Print debug messages when running.
 
 Display help message and exit.
 
+=item I<--version>
+
+Output version information and exit.
+
 =back
 
 =head1 COPYRIGHT
diff --git a/img/dist/IM/imhist.in b/img/dist/IM/imhist.in
index a864f64d..28aef659 100644
--- a/img/dist/IM/imhist.in
+++ b/img/dist/IM/imhist.in
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Jul  6, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 BEGIN {
@@ -13,9 +13,15 @@ BEGIN {
     @im_src_siteperl@
 };
 
-my $VERSION = "imhist version 20031028(IM146)";
-
 $Prog = 'imhist';
+my $VERSION_DATE = "20040704";
+my $VERSION_NUMBER = "147";
+my $VERSION = "${Prog} version ${VERSION_DATE}(IM${VERSION_NUMBER})";
+my $VERSION_INFORMATION = "${Prog} (IM ${VERSION_NUMBER}) ${VERSION_DATE}
+Copyright (C) 1999 IM developing team
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+";
 
 ##
 ## Require packages
@@ -31,7 +37,7 @@ use strict;
 use vars qw($Prog $EXPLANATION @OptConfig
 	    @Hdr
 	    $opt_lookup $opt_remove $opt_msg $opt_dump $opt_add
-	    $opt_subfolders $opt_verbose $opt_debug $opt_help);
+	    $opt_subfolders $opt_verbose $opt_debug $opt_help $opt_version);
 
 ##
 ## Environments
@@ -44,15 +50,16 @@ Usage: imhist [OPTIONS]
 ";
 
 @OptConfig = (
-    'lookup;s;;'     => 'Look up an entry for specified message-id.',
-    'remove;s;;'     => 'Remove whole information on specified message-id.',
-    'msg;s;;'        => 'Message to be deleted if multiple in database.',
-    'dump;b;;'       => 'Dump database just for debugging.',
-    'add;f;;'        => 'Add information of messages in a specified folder.',
-    'subfolders;b;;' => 'Descend sub folders recursively (option for --add).',
-    'verbose;b;;'    => 'With verbose messages.',
-    'debug;d;;'      => "With debug message.",
-    'help;b;;'       => "Show this message.",
+    'lookup;s;;'     => 'Look up an entry for specified message-id',
+    'remove;s;;'     => 'Remove whole information on specified message-id',
+    'msg;s;;'        => 'Message to be deleted if multiple in database',
+    'dump;b;;'       => 'Dump database just for debugging',
+    'add;f;;'        => 'Add information of messages in a specified folder',
+    'subfolders;b;;' => 'Descend sub folders recursively (option for --add)',
+    'verbose;b;;'    => 'With verbose messages',
+    'debug;d;;'      => "With debug message",
+    'help;b;;'       => "Display this help and exit",
+    'version,V;b;;'    => "Output version information and exit",
     );
 
 ##
@@ -62,8 +69,8 @@ Usage: imhist [OPTIONS]
 init_opt(\@OptConfig);
 read_cfg();
 read_opt(\@ARGV); # help?
+print("${VERSION_INFORMATION}") && exit $EXIT_SUCCESS if $opt_version;
 help($EXPLANATION) && exit $EXIT_SUCCESS if $opt_help;
-
 debug_option($opt_debug) if $opt_debug;
 
 ##
@@ -252,6 +259,10 @@ Print debug messages when running.
 
 Display help message and exit.
 
+=item I<--version>
+
+Output version information and exit.
+
 =back
 
 =head1 COPYRIGHT
diff --git a/img/dist/IM/imhsync.in b/img/dist/IM/imhsync.in
index 9c0fac91..211adb6f 100644
--- a/img/dist/IM/imhsync.in
+++ b/img/dist/IM/imhsync.in
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Jul 02, 1998
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 BEGIN {
@@ -13,9 +13,15 @@ BEGIN {
     @im_src_siteperl@
 };
 
-my $VERSION = "imhsync version 20031028(IM146)";
-
 $Prog = 'imhsync';
+my $VERSION_DATE = "20040704";
+my $VERSION_NUMBER = "147";
+my $VERSION = "${Prog} version ${VERSION_DATE}(IM${VERSION_NUMBER})";
+my $VERSION_INFORMATION = "${Prog} (IM ${VERSION_NUMBER}) ${VERSION_DATE}
+Copyright (C) 1999 IM developing team
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+";
 
 ##
 ## Require packages
@@ -29,7 +35,7 @@ use IM::Util;
 use integer;
 use strict;
 use vars qw($Prog $EXPLANATION @OptConfig @Hdr %Folder
-	    $opt_db $opt_folder $opt_verbose $opt_debug $opt_help);
+	    $opt_db $opt_folder $opt_verbose $opt_debug $opt_help $opt_version);
 
 ##
 ## Environments
@@ -42,11 +48,12 @@ Usage: imhsync [OPTIONS]
 ";
 
 @OptConfig = (
-    'db;s;;'         => 'reference DB.',
-    'folder;s;;'     => 'folder to be refiled.',
-    'verbose;b;;'    => 'With verbose messages.',
-    'debug;d;;'      => "With debug message.",
-    'help;b;;'       => "Show this message.",
+    'db;s;;'         => 'reference DB',
+    'folder;s;;'     => 'folder to be refiled',
+    'verbose;b;;'    => 'With verbose messages',
+    'debug;d;;'      => "With debug message",
+    'help;b;;'       => "Display this help and exit",
+    'version,V;b;;'    => "Output version information and exit",
     );
 
 ##
@@ -56,8 +63,8 @@ Usage: imhsync [OPTIONS]
 init_opt(\@OptConfig);
 read_cfg();
 read_opt(\@ARGV); # help?
+print("${VERSION_INFORMATION}") && exit $EXIT_SUCCESS if $opt_version;
 help($EXPLANATION) && exit $EXIT_SUCCESS if $opt_help;
-
 debug_option($opt_debug) if $opt_debug;
 
 ##
@@ -198,7 +205,7 @@ sub my_history_open($$) {
     }
 
     unless ($db) {
-	im_err "history: can not access $dbfile ($!)\n";
+	im_err "history: can not access $dbfile ($!).\n";
 	return -1;
     }
     if ($DBtype eq 'DB') {
@@ -284,6 +291,10 @@ Print debug messages when running.
 
 Display help message and exit.
 
+=item I<--version>
+
+Output version information and exit.
+
 =back
 
 =head1 COPYRIGHT
diff --git a/img/dist/IM/imjoin.in b/img/dist/IM/imjoin.in
index 5ca9fe41..9a617b6d 100644
--- a/img/dist/IM/imjoin.in
+++ b/img/dist/IM/imjoin.in
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: May  5, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 BEGIN {
@@ -13,9 +13,15 @@ BEGIN {
     @im_src_siteperl@
 };
 
-my $VERSION = "imjoin version 20031028(IM146)";
-
 $Prog = 'imjoin';
+my $VERSION_DATE = "20040704";
+my $VERSION_NUMBER = "147";
+my $VERSION = "${Prog} version ${VERSION_DATE}(IM${VERSION_NUMBER})";
+my $VERSION_INFORMATION = "${Prog} (IM ${VERSION_NUMBER}) ${VERSION_DATE}
+Copyright (C) 1999 IM developing team
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+";
 
 ##
 ## Require packages
@@ -27,7 +33,7 @@ use IM::Util;
 use integer;
 use strict;
 use vars qw($Prog $EXPLANATION @EnvConfig @OptConfig $opt_noscan
-	    $opt_src $opt_dst $opt_verbose $opt_debug $opt_help);
+	    $opt_src $opt_dst $opt_verbose $opt_debug $opt_help $opt_version);
 
 ##
 ## Environments
@@ -40,12 +46,13 @@ Usage: imjoin [OPTIONS] MSGS
 ";
 
 @OptConfig = (
-	      'src;f;;'     => "Source folder.",
-	      'dst;s;+inbox;' => "Destination folder.",
-	      'verbose;b;;' => 'With verbose messages.',
-	      'debug;d;;'   => "With debug message.",
-	      'help;b;;'    => "Show this message.",
-	      );
+    'src;f;;'     => "Source folder",
+    'dst;s;+inbox;' => "Destination folder",
+    'verbose;b;;' => 'With verbose messages',
+    'debug;d;;'   => "With debug message",
+    'help;b;;'    => "Display this help and exit",
+    'version,V;b;;' => "Output version information and exit",
+    );
 
 ##
 ## Profile and option processing
@@ -55,8 +62,8 @@ init_opt(\@OptConfig);
 read_env(\@EnvConfig);
 read_cfg();
 read_opt(\@ARGV); # help?
+print("${VERSION_INFORMATION}") && exit $EXIT_SUCCESS if $opt_version;
 help($EXPLANATION) && exit $EXIT_SUCCESS if $opt_help;
-
 debug_option($opt_debug) if $opt_debug;
 
 ##
@@ -321,6 +328,10 @@ Print debug messages when running.
 
 Display help message and exit.
 
+=item I<--version>
+
+Output version information and exit.
+
 =back
 
 =head1 COPYRIGHT
diff --git a/img/dist/IM/imls.in b/img/dist/IM/imls.in
index 111b9f1b..68c7042b 100644
--- a/img/dist/IM/imls.in
+++ b/img/dist/IM/imls.in
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Dec 31, 1995
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 BEGIN {
@@ -13,9 +13,15 @@ BEGIN {
     @im_src_siteperl@
 };
 
-my $VERSION = "imls version 20031028(IM146)";
-
 $Prog = 'imls';
+my $VERSION_DATE = "20040704";
+my $VERSION_NUMBER = "147";
+my $VERSION = "${Prog} version ${VERSION_DATE}(IM${VERSION_NUMBER})";
+my $VERSION_INFORMATION = "${Prog} (IM ${VERSION_NUMBER}) ${VERSION_DATE}
+Copyright (C) 1999 IM developing team
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+";
 
 ##
 ## Require packages
@@ -30,7 +36,8 @@ use vars qw($Prog $EXPLANATION @OptConfig
 	    @servers
 	    $opt_form $opt_jissafe $opt_width $opt_thread @opt_src
 	    $opt_indent $opt_grep $opt_namazu $opt_delimiter $opt_casefold
-	    $opt_verbose $opt_debug $opt_quiet $opt_help $opt_buffer);
+	    $opt_buffer $opt_verbose $opt_quiet
+	    $opt_debug $opt_help $opt_version);
 
 ##
 ## Environments
@@ -65,16 +72,17 @@ Usage: $Prog [OPTIONS] [FOLDER] [RANGE]
     'grep;s;;'    => "Grep pattern for vscan",
     'namazu;b;;'  => "Use namazu for vscan",
     'casefold;b;on;' => 'Case sensitivity'.
-	"\n\t\t(This option affects both fieldname and pattern.)",
+	"\n\t\t(This option affects both fieldname and pattern)",
     'delimiter;s;\n\n|\n----\n;' => 'Mail header delimiter',
     'dupchecktarget,D;s;;'    => 'Duplicate Check Target',
     'mimedecodequoted,x;b;;' => 'Decode broken mime-encoded strings',
     'SSHServer,S;s;localhost;SSH_server'
-                       => 'SSH port relay server.',
-    'quiet;b;;'   => 'Suppress informational messages.',
-    'verbose;b;;' => 'With verbose messages.',
-    'debug;d;;'   => "With debug message.",
-    'help;b;;'    => 'Show this message',
+                       => 'SSH port relay server',
+    'quiet;b;;'   => 'Suppress informational messages',
+    'verbose;b;;' => 'With verbose messages',
+    'debug;d;;'   => "With debug message",
+    'help;b;;'    => "Display this help and exit",
+    'version,V;b;;' => "Output version information and exit",
     );
 
 ##
@@ -84,8 +92,8 @@ Usage: $Prog [OPTIONS] [FOLDER] [RANGE]
 init_opt(\@OptConfig);
 read_cfg();
 read_opt(\@ARGV); # help?
+print("${VERSION_INFORMATION}") && exit $EXIT_SUCCESS if $opt_version;
 help($EXPLANATION) && exit $EXIT_SUCCESS if $opt_help;
-
 debug_option($opt_debug) if $opt_debug;
 
 ##
@@ -679,6 +687,10 @@ Print debug messages when running.
 
 Display help message and exit.
 
+=item I<--version>
+
+Output version information and exit.
+
 =back
 
 =head1 COPYRIGHT
diff --git a/img/dist/IM/immknmz.in b/img/dist/IM/immknmz.in
index 86509100..ca2aa245 100644
--- a/img/dist/IM/immknmz.in
+++ b/img/dist/IM/immknmz.in
@@ -6,7 +6,7 @@
 ### Author:  Shuichi Kitaguchi <kit@Mew.org>
 ###	Internet Message Group <img@mew.org>
 ### Created: Sep 23, 1999
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 BEGIN {
@@ -14,17 +14,24 @@ BEGIN {
     @im_src_siteperl@
 };
 
-my $VERSION = "immknmz version 20031028(IM146)";
-
 $Prog = 'immknmz';
+my $VERSION_DATE = "20040704";
+my $VERSION_NUMBER = "147";
+my $VERSION = "${Prog} version ${VERSION_DATE}(IM${VERSION_NUMBER})";
+my $VERSION_INFORMATION = "${Prog} (IM ${VERSION_NUMBER}) ${VERSION_DATE}
+Copyright (C) 1999 IM developing team
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+";
 
 use IM::Config;
 use IM::Util;
 use IM::Folder;
 use IO::File;
 use strict;
-use vars qw($Prog $EXPLANATION @OptConfig $opt_help $opt_verbose
-	    @opt_src $opt_gcnmz $opt_timestamp);
+use vars qw($Prog $EXPLANATION @OptConfig
+	    @opt_src $opt_gcnmz $opt_timestamp $opt_verbose
+	    $opt_help $opt_version);
 
 $EXPLANATION = "$VERSION
 make namazu index for mail folders
@@ -33,16 +40,18 @@ Usage: $Prog [OPTIONS] [FOLDERS]
 ";
 
 @OptConfig = (
-	      'src;F@;;'    => 'Set source folders. (Mail/.folders file is used by default)',
-	      'gcnmz;b;;'   => "Use gcnmz after mknmz (Garbage Collection for Namazu index).",
-	      'timestamp;b;;' => "Use checking time stamp.",
-	      'verbose;b;;' => "With verbose messages.",
-	      'help;b;;'    => "Show this message.",
-	      );
+    'src;F@;;'    => 'Set source folders (Mail/.folders file is used by default)',
+    'gcnmz;b;;'   => "Use gcnmz after mknmz (Garbage Collection for Namazu index)",
+    'timestamp;b;;' => "Use checking time stamp",
+    'verbose;b;;' => "With verbose messages",
+    'help;b;;'    => "Display this help and exit",
+    'version,V;b;;' => "Output version information and exit",
+    );
 
 init_opt(\@OptConfig);
 read_cfg();
 read_opt(\@ARGV);
+print("${VERSION_INFORMATION}") && exit $EXIT_SUCCESS if $opt_version;
 help($EXPLANATION) && exit $EXIT_SUCCESS if $opt_help;
 
 my $lockdir = namazu_lock_path();
@@ -287,6 +296,10 @@ Use checking time stamp.
 
 Display help message and exit.
 
+=item I<--version>
+
+Output version information and exit.
+
 =back
 
 =head1 COPYRIGHT
diff --git a/img/dist/IM/immv.in b/img/dist/IM/immv.in
index e610418b..9d12405e 100644
--- a/img/dist/IM/immv.in
+++ b/img/dist/IM/immv.in
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 BEGIN {
@@ -13,9 +13,15 @@ BEGIN {
     @im_src_siteperl@
 };
 
-my $VERSION = "immv version 20031028(IM146)";
-
 $Prog = 'immv';
+my $VERSION_DATE = "20040704";
+my $VERSION_NUMBER = "147";
+my $VERSION = "${Prog} version ${VERSION_DATE}(IM${VERSION_NUMBER})";
+my $VERSION_INFORMATION = "${Prog} (IM ${VERSION_NUMBER}) ${VERSION_DATE}
+Copyright (C) 1999 IM developing team
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+";
 
 ##
 ## Require packages
@@ -31,7 +37,7 @@ use strict;
 use vars qw($Prog $EXPLANATION @OptConfig
 	    @msgs
 	    $opt_link $opt_noharm $opt_src @opt_dst
-	    $opt_verbose $opt_debug $opt_help);
+	    $opt_verbose $opt_debug $opt_help $opt_version);
 
 ##
 ## Environments
@@ -46,15 +52,16 @@ Usage: $Prog [OPTIONS] FOLDER... MSGS...
 ";
 
 @OptConfig = (
-    'src;f;;'     => "Set source folder.",
-    'dst;F@;;'    => "Set destination folders.",
-    'link;b;;'    => "Remain original msg in src folder.",
+    'src;f;;'     => "Set source folder",
+    'dst;F@;;'    => "Set destination folders",
+    'link;b;;'    => "Remain original msg in src folder",
     'SSHServer,S;s;localhost;SSH_server'
-                       => 'SSH port relay server.',
-    'noharm;b;;'  => "Display the commands but do not actually execute them.",
-    'verbose;b;;' => 'With verbose messages.',
-    'debug;d;;'   => "With debug message.",
-    'help;b;;'    => "Show this message.",
+                       => 'SSH port relay server',
+    'noharm;b;;'  => "Display the commands but do not actually execute them",
+    'verbose;b;;' => 'With verbose messages',
+    'debug;d;;'   => "With debug message",
+    'help;b;;'    => "Display this help and exit",
+    'version,V;b;;' => "Output version information and exit",
     );
 
 ##
@@ -64,8 +71,8 @@ Usage: $Prog [OPTIONS] FOLDER... MSGS...
 init_opt(\@OptConfig);
 read_cfg();
 read_opt(\@ARGV); # help?
+print("${VERSION_INFORMATION}") && exit $EXIT_SUCCESS if $opt_version;
 help($EXPLANATION) && exit $EXIT_SUCCESS if $opt_help;
-
 debug_option($opt_debug) if $opt_debug;
 
 ##
@@ -299,6 +306,10 @@ Print debug messages when running.
 
 Display help message and exit.
 
+=item I<--version>
+
+Output version information and exit.
+
 =back
 
 =head1 COPYRIGHT
diff --git a/img/dist/IM/impack.in b/img/dist/IM/impack.in
index b4ad86d6..15e653a7 100644
--- a/img/dist/IM/impack.in
+++ b/img/dist/IM/impack.in
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 BEGIN {
@@ -13,9 +13,15 @@ BEGIN {
     @im_src_siteperl@
 };
 
-my $VERSION = "impack version 20031028(IM146)";
-
 $Prog = 'impack';
+my $VERSION_DATE = "20040704";
+my $VERSION_NUMBER = "147";
+my $VERSION = "${Prog} version ${VERSION_DATE}(IM${VERSION_NUMBER})";
+my $VERSION_INFORMATION = "${Prog} (IM ${VERSION_NUMBER}) ${VERSION_DATE}
+Copyright (C) 1999 IM developing team
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+";
 
 ##
 ## Require packages
@@ -28,7 +34,8 @@ use IM::Util;
 use integer;
 use strict;
 use vars qw($Prog $EXPLANATION @OptConfig
-	    $opt_src $opt_noharm $opt_verbose $opt_debug $opt_help);
+	    $opt_src $opt_noharm $opt_verbose
+	    $opt_debug $opt_help $opt_version);
 
 ##
 ## Environments
@@ -41,11 +48,12 @@ Usage: $Prog [OPTIONS] [FOLDER]
 ";
 
 @OptConfig =(
-    'src;F;;'     => "Set source folder.",
-    'noharm;b;;'  => "No packing. Show what will happen.",
-    'verbose;b;;' => 'With verbose messages.',
-    'debug;d;;'   => "With debug message.",
-    'help;b;;'    => "Show this message.",
+    'src;F;;'     => "Set source folder",
+    'noharm;b;;'  => "No packing. Show what will happen",
+    'verbose;b;;' => 'With verbose messages',
+    'debug;d;;'   => "With debug message",
+    'help;b;;'    => "Display this help and exit",
+    'version,V;b;;' => "Output version information and exit",
     );
 
 ##
@@ -55,8 +63,8 @@ Usage: $Prog [OPTIONS] [FOLDER]
 init_opt(\@OptConfig);
 read_cfg();
 read_opt(\@ARGV); # help?
+print("${VERSION_INFORMATION}") && exit $EXIT_SUCCESS if $opt_version;
 help($EXPLANATION) && exit $EXIT_SUCCESS if $opt_help;
-
 debug_option($opt_debug) if $opt_debug;
 
 ##
@@ -139,6 +147,10 @@ Print debug messages when running.
 
 Display help message and exit.
 
+=item I<--version>
+
+Output version information and exit.
+
 =back
 
 =head1 COPYRIGHT
diff --git a/img/dist/IM/impath.in b/img/dist/IM/impath.in
index b0aef32b..e701c531 100644
--- a/img/dist/IM/impath.in
+++ b/img/dist/IM/impath.in
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 BEGIN {
@@ -13,9 +13,15 @@ BEGIN {
     @im_src_siteperl@
 };
 
-my $VERSION = "impath version 20031028(IM146)";
-
 $Prog = 'impath';
+my $VERSION_DATE = "20040704";
+my $VERSION_NUMBER = "147";
+my $VERSION = "${Prog} version ${VERSION_DATE}(IM${VERSION_NUMBER})";
+my $VERSION_INFORMATION = "${Prog} (IM ${VERSION_NUMBER}) ${VERSION_DATE}
+Copyright (C) 1999 IM developing team
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+";
 
 ##
 ## Require packages
@@ -27,7 +33,8 @@ use IM::Folder qw(cur_folder get_impath);
 use integer;
 use strict;
 use vars qw($Prog $EXPLANATION @OptConfig
-	    $opt_src $opt_list $opt_path $opt_verbose $opt_debug $opt_help);
+	    $opt_src $opt_list $opt_path $opt_verbose
+	    $opt_debug $opt_help $opt_version);
 
 ##
 ## Environments
@@ -40,12 +47,13 @@ Usage: $Prog [OPTIONS] [FOLDER]
 ";
 
 @OptConfig =(
-    'src;F;;'     => "Set source folder.",
-    'list;b;;'    => "Show list of folders.",
-    'path;b;;'    => "Show important paths.",
-    'verbose;b;;' => 'With verbose messages.',
-    'debug;d;;'   => "With debug message.",
-    'help;b;;'    => "Show this message.",
+    'src;F;;'     => "Set source folder",
+    'list;b;;'    => "Show list of folders",
+    'path;b;;'    => "Show important paths",
+    'verbose;b;;' => 'With verbose messages',
+    'debug;d;;'   => "With debug message",
+    'help;b;;'    => "Display this help and exit",
+    'version,V;b;;' => "Output version information and exit",
    );
 
 ##
@@ -55,8 +63,8 @@ Usage: $Prog [OPTIONS] [FOLDER]
 init_opt(\@OptConfig);
 read_cfg();
 read_opt(\@ARGV); # help?
+print("${VERSION_INFORMATION}") && exit $EXIT_SUCCESS if $opt_version;
 help($EXPLANATION) && exit $EXIT_SUCCESS if $opt_help;
-
 debug_option($opt_debug) if $opt_debug;
 
 ##
@@ -216,6 +224,10 @@ Print debug messages when running.
 
 Display help message and exit.
 
+=item I<--version>
+
+Output version information and exit.
+
 =back
 
 =head1 COPYRIGHT
diff --git a/img/dist/IM/imput.in b/img/dist/IM/imput.in
index 0202409a..aaa72886 100644
--- a/img/dist/IM/imput.in
+++ b/img/dist/IM/imput.in
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Aug 31, 1995
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 BEGIN {
@@ -13,9 +13,15 @@ BEGIN {
     @im_src_siteperl@
 };
 
-$VERSION = "imput version 20031028(IM146)";
-
 $Prog = 'imput';
+my $VERSION_DATE = "20040704";
+my $VERSION_NUMBER = "147";
+$VERSION = "${Prog} version ${VERSION_DATE}(IM${VERSION_NUMBER})";
+my $VERSION_INFORMATION = "${Prog} (IM ${VERSION_NUMBER}) ${VERSION_DATE}
+Copyright (C) 1999 IM developing team
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+";
 
 require 5.003;
 
@@ -40,7 +46,8 @@ use strict 'refs';
 use strict 'subs';
 use vars qw($DebugAll $QueueStatus $Subject $Ignore_Dot $Fcc_partial
 	    $News_severe_check $PreserveMessage $Queuing $Comment_Name
-	    $Help $JustQueuing $Me_too $Dcc_Address $PGP_Sign);
+	    $JustQueuing $Me_too $Dcc_Address $PGP_Sign
+	    $opt_verbose $Help $opt_version);
 
 $EXPLANATION = "$VERSION
 put mail/news message into networks
@@ -67,164 +74,168 @@ Usage: $Prog [OPTIONS] [MSG]
 
 @OptConfig = (
     # table of commandline options
+    'version,V;b;;opt_version'
+	=> "Output version information and exit",
     'Help;b;;Help'
-	=> 'Show this message.',
+	=> "Display this help and exit",
     'Debug;b;;DebugAll'
-	=> 'Set all debug options.',
+	=> 'Set all debug options',
     'DebugFlag;s;;DebugFlag'
-	=> "Set specific debug options (separated with ',').",
+	=> "Set specific debug options (separated with ',')",
     'Verbose;b;;opt_verbose'
-	=> 'Set verbose mode.',
+	=> 'Set verbose mode',
     ## late evaluated options
     'Require;s;;User_require'
-	=> 'User defined perl script to be required.',
+	=> 'User defined perl script to be required',
     'SMTPservers;s;localhost;Smtp_servers'
 	=> "List of SMTP servers (separated with ',')
 		Each element should be server[/remote_port][%local_port]",
     'EmgSMTPsvrs;s;;Emg_Smtp_servers'
-	=> 'List of SMTP servers for Emergency Use (i.e. error reporting).',
+	=> 'List of SMTP servers for Emergency Use (i.e. error reporting)',
     'TryNextOnFatal;b;;Smtp_fatal_next'
-	=> 'Try next SMTP server evenif permanent failure.',
+	=> 'Try next SMTP server evenif permanent failure',
     'NNTPservers;s;localhost;Nntp_servers'
 	=> "List of NNTP servers (separated with ',').
 		Each element should be server[/remote_port][%local_port]",
     'NNTPauthuser;s;;Nntp_authuser'
-	=> 'User name for NNTP authentication.',
+	=> 'User name for NNTP authentication',
     'ClientName;s;localhost;Client_name'
-	=> 'Name as a SMTP client (used for SMTP HELO).',
+	=> 'Name as a SMTP client (used for SMTP HELO)',
     'SSHServer;s;localhost;SSH_server'
-	=> 'SSH port relay server.',
+	=> 'SSH port relay server',
     'ObeyMTAdomain;b;;Obey_MTA_domain'
-	=> 'Do not qualify local addresses with default domain.',
+	=> 'Do not qualify local addresses with default domain',
     'FromDomain;s;;Default_from_domain_name'
-	=> 'Default domain name for sender.',
+	=> 'Default domain name for sender',
     'ToDomain;s;;Default_to_domain_name'
-	=> 'Default domain name for recipients.',
+	=> 'Default domain name for recipients',
+    'MsgIdUser;s;;Message_id_user_name'
+	=> 'A user name for Message-Id generation',
     'MsgIdDomain;s;;Message_id_domain_name'
-	=> 'Default domain name for Message-Id generation.',
+	=> 'A domain name for Message-Id generation',
     'NoMsgIdForNews;s;;NoMsgIdForNews'
-	=> 'Strip Message-Id when posting to news system.',
+	=> 'Strip Message-Id when posting to news system',
     'User;s;;User_name'
-	=> "Local part of the sender's address.",
+	=> "Local part of the sender's address",
     'Address;s;;Mail_Address'
 	=> 'Address used in From: header; equivalent to User@FromDomain',
     'Name;s;;Sender_name'
 	=> 'Commentary name for sender',
     'NameInComment;b;;Comment_Name'
-    	=> 'Show commentary name in () on From: header.',
+    	=> 'Show commentary name in () on From: header',
     'Org;s;;Organization'
-    	=> 'Name of organization for news posting.',
+    	=> 'Name of organization for news posting',
     'Subj;s;;Subject'
-    	=> 'A string for subject field.',
+    	=> 'A string for subject field',
     'NScmpl;b;;Cmpl_with_gethostbyname'
-    	=> 'Use domain-part completion with nameserver.',
+    	=> 'Use domain-part completion with nameserver',
     'ShowRcpts;b;1;Show_Rcpts_Header'
-    	=> 'Allow to show recipients in header as To: if no To: in original.',
+    	=> 'Allow to show recipients in header as To: if no To: in original',
     'MeToo;b;;Me_too'
-    	=> 'Request DCC to me.',
+    	=> 'Request DCC to me',
     'Dcc;s;;Dcc_Address'
-    	=> 'Supplemental DCC address.',
+    	=> 'Supplemental DCC address',
     'Fcc;s;;Fcc_folder'
-	=> 'Folder name to save FCC.',
+	=> 'Folder name to save FCC',
     'Receipt;b;;Dsn_success_report'
-    	=> 'Need a report of successful delivery.',
+    	=> 'Need a report of successful delivery',
     'Group;s;;Newsgroups'
-	=> 'Newsgroup names to be posted in.',
+	=> 'Newsgroup names to be posted in',
 ## if ISO2022JP
     'JPconv;b;;Iso2022jp_code_conversion'
-	=> 'Convert japanese character encoding from EUC/SJIS to JIS.',
+	=> 'Convert japanese character encoding from EUC/SJIS to JIS',
     'DefCode;s;8BIT;Default_code'
-	=> 'Default classification of japanese character code.' .
+	=> 'Default classification of japanese character code' .
 	      "\n\t\t(EUC/SJIS/8BIT)",
     'JPheader;b;1;Iso2022jp_header_mime_conv'
-	=> 'Encode japanese JIS characters to MIME style at header.',
+	=> 'Encode japanese JIS characters to MIME style at header',
     'HdrQEncoding;b;;HdrQEncoding'
-	=> 'Header encoding type: 0 is B; 1 is Q.',
+	=> 'Header encoding type: 0 is B; 1 is Q',
 ## endif
     'NoHdrFolding;b;;NoFolding'
-	=> 'Do not fold long header lines.',
+	=> 'Do not fold long header lines',
     'SortHeader;s;;HeaderSeq'
-	=> "Header sequence for sorting (labels separated with ',').",
+	=> "Header sequence for sorting (labels separated with ',')",
     '8to7;b;;Conv_8to7'
-	=> 'Convert 8bit body to 7bit by base64/quoted-printable encoding.',
+	=> 'Convert 8bit body to 7bit by base64/quoted-printable encoding',
     '8BitLabel;s;unknown-8bit;Unknown8bit_label'
-	=> 'Sub-type label for unknown 8bit body on Content-Type:.',
+	=> 'Sub-type label for unknown 8bit body on Content-Type:',
     'Lines;i;;Lines_to_partial'	# XXX
-	=> 'Line numbers for splitting into partial messages.',
+	=> 'Line numbers for splitting into partial messages',
     'Sleep;i;10;Partial_sleep'
-	=> 'Sleep interval for dispatching each splitted messages.',
+	=> 'Sleep interval for dispatching each splitted messages',
     'Log;s;putlog;Log_file'	# XXX
-	=> 'File name to write delivery log.',
+	=> 'File name to write delivery log',
     'Syslog;b;;'
-	=> 'Use SYSLOG feature instead of writing to a file directly.',
+	=> 'Use SYSLOG feature instead of writing to a file directly',
     'Report;b;1;Error_report_by_mail'
-    	=> 'Report errors via mail.',
+    	=> 'Report errors via mail',
     'MsgId;b;1;Generate_message_id'
-	=> 'Generate Message-Id header line.',
+	=> 'Generate Message-Id header line',
     'PidMsgId;b;;Message_id_PID'
-	=> 'Generate Message-Id with Process ID.',
+	=> 'Generate Message-Id with Process ID',
     'UidMsgId;b;;Message_id_UID'
-	=> 'Generate Message-Id with User ID instead of login name.',
+	=> 'Generate Message-Id with User ID instead of login name',
     'Date;b;1;Generate_date'
-    	=> 'Generate Date header line.',
+    	=> 'Generate Date header line',
     'NewsGMTdate;b;;NewsGMTdate'
-	=> 'Generate date field in GMT for posting news.',
+	=> 'Generate date field in GMT for posting news',
     'UseLines;b;1;UseLines'
-	=> 'Generate Lines header line.',
+	=> 'Generate Lines header line',
     'AliasesFile;s;;Mail_aliases'	# XXX
-	=> 'List of files for mail address aliasing.',
+	=> 'List of files for mail address aliasing',
     'Addrbook;s;;addrbooks'
-	=> 'List of Addrbook files.',
+	=> 'List of Addrbook files',
     'HostAliases;s;;Host_aliases'	# XXX
-	=> 'List of files for domain part completion.',
+	=> 'List of files for domain part completion',
     'FccPartial;b;;Fcc_partial'
-    	=> 'Save FCC with partial format.',
+    	=> 'Save FCC with partial format',
     'Dead;s;dead.letter;Dead_letter'	# XXX
-    	=> 'Path of file to save unsent message as a deadletter.',
+    	=> 'Path of file to save unsent message as a deadletter',
     'JustQueuing;b;;JustQueuing'
-	=> 'Just store message into queue without attempt of delivery.',
+	=> 'Just store message into queue without attempt of delivery',
     'Queuing;b;;Queuing'
-	=> 'Store message into queue on delivery failure.',
+	=> 'Store message into queue on delivery failure',
     'ProcessQueue;b;;ProcessQueue'
-	=> 'Process queued messages.',
+	=> 'Process queued messages',
     'QueueStatus;b;;QueueStatus'
-	=> 'Show list of queued messages.',
+	=> 'Show list of queued messages',
     'Folder;s;;Draft_folder'
-	=> 'Path of draft folder directory.',
+	=> 'Path of draft folder directory',
     'MIMEbcc;b;1;Mime_bcc'
-	=> 'Use MIME (message/rfc822) style BCC.',
+	=> 'Use MIME (message/rfc822) style BCC',
     'TrashMark;s;#;Trashmark'
-	=> 'Prefix character for draft message file renaming.',
+	=> 'Prefix character for draft message file renaming',
     'Preserve;b;;PreserveMessage'
-	=> 'Preserve draft message as is even if dispatched successfully.',
+	=> 'Preserve draft message as is even if dispatched successfully',
     'Message;s;;Draft_message'
-	=> 'Path/name of draft message.',
+	=> 'Path/name of draft message',
     'PGPsign;b;;PGP_Sign'
-	=> 'Generate PGP signature for body-part.',
+	=> 'Generate PGP signature for body-part',
     'MultipartAdd;s@;;Mulipart_messages'
-	=> 'Path/name of message to be added as a part of multipart message.',
+	=> 'Path/name of message to be added as a part of multipart message',
     'FilenameAdd;b;;Filename_Add'
-	=> 'Add filename field at Content-Disposition header.',
+	=> 'Add filename field at Content-Disposition header',
     'SMTP;b;;Smtp_input_mode'
-	=> 'Perform SMTP style input mode.',
+	=> 'Perform SMTP style input mode',
     'Annotate;b;;Anno_flag'
-	=> 'Annotate on the parent message (MsgDB required).',
+	=> 'Annotate on the parent message (MsgDB required)',
     'Dist;b;;Dist_flag'
-	=> 'Redistribution mode (using Resent-*:).',
+	=> 'Redistribution mode (using Resent-*:)',
     'DistMsg;s;;Dist_file'
-    	=> 'Path of message for redistribution.',
+    	=> 'Path of message for redistribution',
     'ObeyHeader;b;;Obey_header'
-	=> 'Collect recipients from message header.',
+	=> 'Collect recipients from message header',
     'IgnoreDot;b;;Ignore_Dot'
-	=> 'Ignore DOT for message termination.',
+	=> 'Ignore DOT for message termination',
     'NewsCheck;b;;News_severe_check'
-	=> 'No news posting if To, Cc header found evenif Newsgroups: exists.',
+	=> 'No news posting if To, Cc header found evenif Newsgroups: exists',
     'ESMTP;b;;Esmtp_flag'
-	=> 'Enforce ESMTP (always begins with EHLO).',
+	=> 'Enforce ESMTP (always begins with EHLO)',
     'NewsPost;b;1;News_flag'
-	=> 'Enable NNTP.',
+	=> 'Enable NNTP',
     'AddHeader;s@;;Add_headers'
-	=> 'Header lines to be added.',
+	=> 'Header lines to be added',
 );
 
 @CmpConfig = (
@@ -293,6 +304,7 @@ if ($selector ne '') {
     $error = 1 if (set_selector($selector) < 0);
 }
 read_opt(\@ARGV);
+print("${VERSION_INFORMATION}") && exit $EXIT_SUCCESS if $opt_version;
 help($EXPLANATION) && exit $EXIT_SUCCESS if $Help;
 
 ##
@@ -881,6 +893,13 @@ sub init_final {
 	}
     }
 
+    unless ($Message_id_user_name) {
+	if ($Message_id_UID) {
+	    $Message_id_user_name = $<;
+	} else {
+	    $Message_id_user_name = $Login;
+	}
+    }
     unless ($Message_id_domain_name) {
 	if ($Default_from_domain_name) {
 	    $Message_id_domain_name = $Default_from_domain_name;
@@ -2121,6 +2140,10 @@ Header generation by command line option not supported.
 
 =over 5
 
+=item I<--version>
+
+Output version information and exit.
+
 =item I<--help>
 
 Display help message and exit.
@@ -2185,9 +2208,13 @@ Default domain name for sender.
 
 Default domain name for recipients.
 
+=item I<--msgiduser=STRING>
+
+A user name for Message-Id generation.
+
 =item I<--msgiddomain=STRING>
 
-Default domain name for Message-Id generation.
+A domain name for Message-Id generation.
 
 =item I<--nomsgidfornews=STRING>
 
diff --git a/img/dist/IM/impwagent.in b/img/dist/IM/impwagent.in
index 34f53d69..2d9b6896 100644
--- a/img/dist/IM/impwagent.in
+++ b/img/dist/IM/impwagent.in
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Sep 13, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 BEGIN {
@@ -13,9 +13,15 @@ BEGIN {
     @im_src_siteperl@
 };
 
-my $VERSION = "impwagent version 20031028(IM146)";
-
 $Prog = 'impwagent';
+my $VERSION_DATE = "20040704";
+my $VERSION_NUMBER = "147";
+my $VERSION = "${Prog} version ${VERSION_DATE}(IM${VERSION_NUMBER})";
+my $VERSION_INFORMATION = "${Prog} (IM ${VERSION_NUMBER}) ${VERSION_DATE}
+Copyright (C) 1999 IM developing team
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+";
 
 ##
 ## Require packages
@@ -59,6 +65,11 @@ if ($ARGV[0] =~ /clear/i) {
     exit $EXIT_SUCCESS;
 }
 
+if ($ARGV[0] =~ /--version/i) {
+    print("${VERSION_INFORMATION}") && exit $EXIT_SUCCESS;
+}
+
+# display help
 if ($ARGV[0] !~ /start/i && @ARGV > 0) {
     print <<EOF;
 $VERSION
@@ -66,9 +77,10 @@ hold passwords for IM
 
 Usage:
 	$Prog [start]       start $Prog
-	$Prog stop/quit     terminate $Prog
+	$Prog stop|quit     terminate $Prog
 	$Prog clear         clear passwords held by $Prog
-	$Prog help          show this message
+	$Prog help|--help   Display this help and exit
+	$Prog --version     Output version information and exit
 
 This command holds passwords to reuse on later sessions for IM.
 
@@ -228,7 +240,7 @@ impwagent - hold passwords for IM
 
 =head1 SYNOPSIS
 
-B<impwagent> [start | stop | quit | clear | help]
+B<impwagent> [OPTIONS]
 
 =head1 DESCRIPTION
 
@@ -260,9 +272,13 @@ Terminate impwagent.
 
 Clear passwords held by impwagent.
 
-=item I<help>
+=item I<help, --help>
+
+Display help message and exit.
+
+=item I<--version>
 
-Show help message.
+Output version information and exit.
 
 =back
 
diff --git a/img/dist/IM/imrm.in b/img/dist/IM/imrm.in
index 7210d046..2fce4b7f 100644
--- a/img/dist/IM/imrm.in
+++ b/img/dist/IM/imrm.in
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 BEGIN {
@@ -13,9 +13,15 @@ BEGIN {
     @im_src_siteperl@
 };
 
-my $VERSION = "imrm version 20031028(IM146)";
-
 $Prog = 'imrm';
+my $VERSION_DATE = "20040704";
+my $VERSION_NUMBER = "147";
+my $VERSION = "${Prog} version ${VERSION_DATE}(IM${VERSION_NUMBER})";
+my $VERSION_INFORMATION = "${Prog} (IM ${VERSION_NUMBER}) ${VERSION_DATE}
+Copyright (C) 1999 IM developing team
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+";
 
 ##
 ## Require packages
@@ -31,7 +37,7 @@ use strict;
 use vars qw($Prog $EXPLANATION @OptConfig
 	    @msgs
 	    $opt_noharm $opt_src @opt_dst
-	    $opt_verbose $opt_debug $opt_help);
+	    $opt_verbose $opt_debug $opt_help $opt_version);
 
 ##
 ## Environments
@@ -46,14 +52,15 @@ Usage: $Prog [OPTIONS] FOLDER... MSGS...
 ";
 
 @OptConfig = (
-    'src;F;;'     => "Set source folder.",
-    'dst;f@;;'    => "Set destination folder.",
+    'src;F;;'     => "Set source folder",
+    'dst;f@;;'    => "Set destination folder",
     'SSHServer,S;s;localhost;SSH_server'
-                       => 'SSH port relay server.',
-    'noharm;b;;'  => "Display the commands but do not actually execute them.",
-    'verbose;b;;' => 'With verbose messages.',
-    'debug;d;;'   => "With debug message.",
-    'help;b;;'    => "Show this message.",
+                       => 'SSH port relay server',
+    'noharm;b;;'  => "Display the commands but do not actually execute them",
+    'verbose;b;;' => 'With verbose messages',
+    'debug;d;;'   => "With debug message",
+    'help;b;;'    => "Display this help and exit",
+    'version,V;b;;' => "Output version information and exit",
     );
 
 ##
@@ -63,8 +70,8 @@ Usage: $Prog [OPTIONS] FOLDER... MSGS...
 init_opt(\@OptConfig);
 read_cfg();
 read_opt(\@ARGV); # help?
+print("${VERSION_INFORMATION}") && exit $EXIT_SUCCESS if $opt_version;
 help($EXPLANATION) && exit $EXIT_SUCCESS if $opt_help;
-
 debug_option($opt_debug) if $opt_debug;
 
 ##
@@ -289,6 +296,10 @@ Print debug messages when running.
 
 Display help message and exit.
 
+=item I<--version>
+
+Output version information and exit.
+
 =back
 
 =head1 COPYRIGHT
diff --git a/img/dist/IM/imsetup.in b/img/dist/IM/imsetup.in
index cd2c905f..af7ff14b 100644
--- a/img/dist/IM/imsetup.in
+++ b/img/dist/IM/imsetup.in
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: May  9, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 BEGIN {
@@ -13,9 +13,15 @@ BEGIN {
     @im_src_siteperl@
 };
 
-my $VERSION = "imsetup version 20031028(IM146)";
-
 $Prog = 'imsetup';
+my $VERSION_DATE = "20040704";
+my $VERSION_NUMBER = "147";
+my $VERSION = "${Prog} version ${VERSION_DATE}(IM${VERSION_NUMBER})";
+my $VERSION_INFORMATION = "${Prog} (IM ${VERSION_NUMBER}) ${VERSION_DATE}
+Copyright (C) 1999 IM developing team
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+";
 
 ##
 ## Require packages
@@ -29,7 +35,8 @@ use IM::Address qw(extract_addr);
 use integer;
 use strict;
 use vars qw($Prog $EXPLANATION @OptConfig
-	    $opt_fromdomain $opt_noharm $opt_usecl $opt_nosync $opt_help);
+	    $opt_fromdomain $opt_noharm $opt_usecl $opt_nosync
+	    $opt_help $opt_version);
 
 ##
 ## Environments
@@ -62,9 +69,10 @@ Usage: $Prog [Options]
 ";
 
 @OptConfig = (
-    'FromDomain;s;;' => 'Default domain name for mail address.',
-    'noharm;b;;' => "Do execute setup, show what will be performed.",
-    'help;b;;'   => "Show this message.",
+    'FromDomain;s;;' => 'Default domain name for mail address',
+    'noharm;b;;' => "Do execute setup, show what will be performed",
+    'help;b;;'    => "Display this help and exit",
+    'version,V;b;;' => "Output version information and exit",
     );
 
 ##
@@ -74,6 +82,7 @@ Usage: $Prog [Options]
 init_opt(\@OptConfig);
 read_cfg();
 read_opt(\@ARGV); # help?
+print("${VERSION_INFORMATION}") && exit $EXIT_SUCCESS if $opt_version;
 help($EXPLANATION) && exit $EXIT_SUCCESS if $opt_help;
 
 ##
@@ -427,8 +436,11 @@ keep=$keep
 #rpath=append			# conversion of UNIX From into Return-Path:
 #PopHistory=pophist-{POPSERVERID}	# to save last state (relative to ~/.im/)
 #NntpHistory=newshist		# to save last state (relative to ~/.im/)
-#MBoxStyle=qmail			# if folder style mbox of qmail is used
-#Imget.Src=local:\${HOME}/Maildir	# in case of qmail
+#MboxFilter=bogofilter -p -M -I	# filter for mbox file
+#MboxFilter=spamoracle mark
+#MBoxFilter=bsfilter --spam-cutoff 0.85 --pipe --insert-flag --mbox 2>/dev/null
+#MBoxStyle=qmail		# in case of qmail (maildir format)
+#Imget.Src=local:\${HOME}/Maildir
 UseCL=$usecl			# Use value of Content-Length header
 NoSync=$nosync			# Do not need fsync(2) on writing file
 #FsyncNumber=0			# if 0, system call number of fsync is guessed
@@ -450,18 +462,18 @@ keep=$keep
 #Keep=7				# preserve read messages on server
 #ProtoKeep=UIDL			# how to know which message is unread
 				# (UIDL, LAST, STATUS, MSGID)
-#IgnorePostPet=yes		# leave messages for PostPet on mbox (POP only)
+#IgnorePostPet=yes		# leave messages for PostPet on POP server
 
 ---
         if ($src =~ /^imap/i) {
             print CONFIG <<"---";
-Imget.Src=imap
+Imget.Src=imap%INBOX
 ImapAccount=/$auth:$user\@$host
 keep=$keep
 ---
         }
         print CONFIG <<"---";
-#Imget.Src=imap
+#Imget.Src=imap%INBOX
 #ImapAccount=/AUTH\@localhost	# account info for IMAP access
 #ImapAccount=/AUTH:user\@host	# account info with user name
 #HttpProxy=proxy-server:8080	# proxy server for HTTP access
@@ -492,6 +504,7 @@ keep=$keep
 #FccDir=\$MailDir		# directory for FCC folders
 #QueueDir=queue			# directory for to store messages to be sent
 #UseXDispatcher=yes		# use X-Dispatcher field
+#MsgIdUser=\${USER}		# user part for creation of Message-Id:
 #MsgIdDomain=\${HOST}		# if you want to use FQDN of dispatching host
 #ObeyMTAdomain=yes		# do not append domainpart to addresses by imput
 #NoMsgIdForNews=yes		# do not insert Message-Id: when posting as news
@@ -564,6 +577,10 @@ Do execute setup, show what will be performed.
 
 Display help message and exit.
 
+=item I<--version>
+
+Output version information and exit.
+
 =back
 
 =head1 COPYRIGHT
diff --git a/img/dist/IM/imsort.in b/img/dist/IM/imsort.in
index a99836e0..d533e8c7 100644
--- a/img/dist/IM/imsort.in
+++ b/img/dist/IM/imsort.in
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Jul  2, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 BEGIN {
@@ -13,9 +13,15 @@ BEGIN {
     @im_src_siteperl@
 };
 
-my $VERSION = "imsort version 20031028(IM146)";
-
 $Prog = 'imsort';
+my $VERSION_DATE = "20040704";
+my $VERSION_NUMBER = "147";
+my $VERSION = "${Prog} version ${VERSION_DATE}(IM${VERSION_NUMBER})";
+my $VERSION_INFORMATION = "${Prog} (IM ${VERSION_NUMBER}) ${VERSION_DATE}
+Copyright (C) 1999 IM developing team
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+";
 
 ##
 ## Require packages
@@ -29,7 +35,7 @@ use integer;
 use strict;
 use vars qw($Prog $EXPLANATION @OptConfig
 	    $opt_field $opt_mode $opt_noharm $opt_src
-	    $opt_verbose $opt_debug $opt_help);
+	    $opt_verbose $opt_debug $opt_help $opt_version);
 
 ##
 ## Environments
@@ -42,13 +48,14 @@ Usage: $Prog [OPTIONS] FOLDER [MSGS...]
 ";
 
 @OptConfig = (
-    'src;F;;'      => "Set source folder.",
-    'field;s;date;'=> "Sort by the specified field.",
-    'mode;s;date;' => "Set sort mode to date, num, text or ml.",
-    'noharm;b;;'   => "Display the commands but do not actually execute them.",
-    'verbose;b;;'  => 'With verbose messages.',
-    'debug;d;;'    => "With debug message.",
-    'help;b;;'     => "Show this message.",
+    'src;F;;'      => "Set source folder",
+    'field;s;date;'=> "Sort by the specified field",
+    'mode;s;date;' => "Set sort mode to date, num, text or ml",
+    'noharm;b;;'   => "Display the commands but do not actually execute them",
+    'verbose;b;;'  => 'With verbose messages',
+    'debug;d;;'    => "With debug message",
+    'help;b;;'    => "Display this help and exit",
+    'version,V;b;;' => "Output version information and exit",
     );
 
 ##
@@ -58,8 +65,8 @@ Usage: $Prog [OPTIONS] FOLDER [MSGS...]
 init_opt(\@OptConfig);
 read_cfg();
 read_opt(\@ARGV); # help?
+print("${VERSION_INFORMATION}") && exit $EXIT_SUCCESS if $opt_version;
 help($EXPLANATION) && exit $EXIT_SUCCESS if $opt_help;
-
 debug_option($opt_debug) if $opt_debug;
 
 ##
@@ -257,6 +264,10 @@ Print debug messages when running.
 
 Display help message and exit.
 
+=item I<--version>
+
+Output version information and exit.
+
 =back
 
 =head1 COPYRIGHT
diff --git a/img/dist/IM/imstore.in b/img/dist/IM/imstore.in
index 051d92b7..fe1940b2 100644
--- a/img/dist/IM/imstore.in
+++ b/img/dist/IM/imstore.in
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Dec 31, 1995
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 BEGIN {
@@ -13,9 +13,15 @@ BEGIN {
     @im_src_siteperl@
 };
 
-my $VERSION = "imstore version 20031028(IM146)";
-
 $Prog = 'imstore';
+my $VERSION_DATE = "20040704";
+my $VERSION_NUMBER = "147";
+my $VERSION = "${Prog} version ${VERSION_DATE}(IM${VERSION_NUMBER})";
+my $VERSION_INFORMATION = "${Prog} (IM ${VERSION_NUMBER}) ${VERSION_DATE}
+Copyright (C) 1999 IM developing team
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+";
 
 use IM::Config;
 use IM::MsgStore;
@@ -23,7 +29,8 @@ use IM::Util;
 use integer;
 use strict;
 use vars qw($Prog $EXPLANATION @OptConfig
-	    $opt_dst $opt_verbose $opt_debug $opt_help $opt_noscan);
+	    $opt_dst $opt_noscan
+	    $opt_verbose $opt_debug $opt_help $opt_version);
 
 ##
 ## Environments
@@ -37,9 +44,10 @@ Usage: $Prog [OPTIONS]
 
 @OptConfig = (
     'dst;s;+inbox;' => 'Set destination folder',
-    'verbose;b;;'   => 'With verbose messages.',
-    'debug;d;;'     => "With debug message.",
-    'help;b;;'      => 'Show this message'
+    'verbose;b;;'   => 'With verbose messages',
+    'debug;d;;'     => "With debug message",
+    'help;b;;'      => "Display this help and exit",
+    'version,V;b;;'   => "Output version information and exit",
     );
 
 ##
@@ -49,8 +57,8 @@ Usage: $Prog [OPTIONS]
 init_opt(\@OptConfig);
 read_cfg();
 read_opt(\@ARGV); # help?
+print("${VERSION_INFORMATION}") && exit $EXIT_SUCCESS if $opt_version;
 help($EXPLANATION) && exit $EXIT_SUCCESS if $opt_help;
-
 debug_option($opt_debug) if $opt_debug;
 
 &process_stdin();
@@ -104,6 +112,10 @@ Print debug messages when running.
 
 Display help message and exit.
 
+=item I<--version>
+
+Output version information and exit.
+
 =back
 
 =cut
diff --git a/img/dist/IM/imtar.in b/img/dist/IM/imtar.in
index 1555fc15..82ee1373 100644
--- a/img/dist/IM/imtar.in
+++ b/img/dist/IM/imtar.in
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 08, 1998
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 BEGIN {
@@ -13,9 +13,15 @@ BEGIN {
     @im_src_siteperl@
 };
 
-my $VERSION = "imtar version 20031028(IM146)";
-
 $Prog = 'imtar';
+my $VERSION_DATE = "20040704";
+my $VERSION_NUMBER = "147";
+my $VERSION = "${Prog} version ${VERSION_DATE}(IM${VERSION_NUMBER})";
+my $VERSION_INFORMATION = "${Prog} (IM ${VERSION_NUMBER}) ${VERSION_DATE}
+Copyright (C) 1999 IM developing team
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+";
 
 ##
 ## Require packages
@@ -27,7 +33,8 @@ use IM::Util;
 use integer;
 use strict;
 use vars qw($Prog $EXPLANATION @OptConfig
-	    $opt_src $opt_dst $opt_noharm $opt_verbose $opt_debug $opt_help);
+	    $opt_src $opt_dst $opt_noharm $opt_verbose
+	    $opt_debug $opt_help $opt_version);
 
 ##
 ## Environments
@@ -40,12 +47,13 @@ Usage: $Prog [OPTIONS] [FOLDER] [MSGS]
 ";
 
 @OptConfig =(
-    'src;F;;'     => "Set source folder.",
-    'dst;s;./msgbox;' => "Destination MMDF file.",
-    'noharm;b;;'  => "No operation. Show what will happen.",
-    'verbose;b;;' => 'With verbose messages.',
-    'debug;d;;'   => "With debug message.",
-    'help;b;;'    => "Show this message.",
+    'src;F;;'     => "Set source folder",
+    'dst;s;./msgbox;' => "Destination MMDF file",
+    'noharm;b;;'  => "No operation. Show what will happen",
+    'verbose;b;;' => 'With verbose messages',
+    'debug;d;;'   => "With debug message",
+    'help;b;;'    => "Display this help and exit",
+    'version,V;b;;' => "Output version information and exit",
     );
 
 ##
@@ -55,8 +63,8 @@ Usage: $Prog [OPTIONS] [FOLDER] [MSGS]
 init_opt(\@OptConfig);
 read_cfg();
 read_opt(\@ARGV); # help?
+print("${VERSION_INFORMATION}") && exit $EXIT_SUCCESS if $opt_version;
 help($EXPLANATION) && exit $EXIT_SUCCESS if $opt_help;
-
 debug_option($opt_debug) if $opt_debug;
 
 ##
@@ -165,6 +173,10 @@ Print debug messages when running.
 
 Display help message and exit.
 
+=item I<--version>
+
+Output version information and exit.
+
 =back
 
 =head1 COPYRIGHT
diff --git a/img/lib/IM/Address.pm b/img/lib/IM/Address.pm
index 06524365..b6e309e4 100644
--- a/img/lib/IM/Address.pm
+++ b/img/lib/IM/Address.pm
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::Address.pm version 20031028(IM146)";
diff --git a/img/lib/IM/Alias.pm b/img/lib/IM/Alias.pm
index f8725e20..6b04634a 100644
--- a/img/lib/IM/Alias.pm
+++ b/img/lib/IM/Alias.pm
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::Alias.pm version 20031028(IM146)";
diff --git a/img/lib/IM/Config.pm.in b/img/lib/IM/Config.pm.in
index 4e2f8507..10f55106 100644
--- a/img/lib/IM/Config.pm.in
+++ b/img/lib/IM/Config.pm.in
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::Config.pm version 20031028(IM146)";
@@ -37,7 +37,7 @@ use vars qw(@ISA @EXPORT);
     context_file getchksbr_file getsbr_file scansbr_file scan_header_pick
     address addresses_regex
     msgdbfile msgdbtype
-    mbox_style
+    mbox_style mbox_filter
     nntpservers nntphistoryfile nntpauthuser set_nntpauthuser
     popaccount pophistoryfile imapaccount httpproxy noproxy
     usepwagent pwagentport pwagent_tmp_dir pwagent_tmp_path usepwfiles pwfiles
@@ -127,7 +127,8 @@ BEGIN {
     'getsbr;s;;GetSbrFile'		=> 'Get hook subroutine script',
     'scansbr;s;;ScanSbrFile'		=> 'Scan hook subroutine script',
     'scanheaderpick;s;;ScanHeaderPick'  => 'Scan headers to pick up',
-    'mboxstyle;s;;MBoxStyle'		=> 'Style of local MBox format',
+    'mboxstyle;s;;MBoxStyle'		=> 'Style of local mailbox format',
+    'mboxfilter;s;;MboxFilter'		=> 'Filter for mbox file',
     'nntpservers;s;;NNTPservers'	=> 'List of NNTP servers',
     'nntphistory;s;;NNTPhistory'	=> 'Status file of NNTP access',
     'nntpauthuser;s;;NNTPauthuser'	=> 'User name for NNTP authentication',
@@ -873,6 +874,10 @@ sub mbox_style() {
     return $MBoxStyle;
 }
 
+sub mbox_filter() {
+    return $MboxFilter;
+}
+
 sub nntpservers() {
     return $NNTPservers;
 }
@@ -1150,7 +1155,7 @@ addrbook_file aliases_file petname_file mail_folders_file
 context_file getchksbr_file getsbr_file scansbr_file scan_header_pick
 address addresses_regex
 msgdbfile msgdbtype
-mbox_style
+mbox_style mbox_filter
 nntpservers nntphistoryfile nntpauthuser set_nntpauthuser
 popaccount pophistoryfile imapaccount httpproxy noproxy
 usepwagent pwagentport pwagent_tmp_dir pwagent_tmp_path usepwfiles pwfiles
diff --git a/img/lib/IM/EncDec.pm b/img/lib/IM/EncDec.pm
index c01433a0..ac4560a6 100644
--- a/img/lib/IM/EncDec.pm
+++ b/img/lib/IM/EncDec.pm
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::EncDec.pm version 20031028(IM146)";
diff --git a/img/lib/IM/File.pm b/img/lib/IM/File.pm
index 384c4434..c7bfd00d 100644
--- a/img/lib/IM/File.pm
+++ b/img/lib/IM/File.pm
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Jul  7, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::File.pm version 20031028(IM146)";
diff --git a/img/lib/IM/Folder.pm b/img/lib/IM/Folder.pm
index 9f3a746f..b55a220b 100644
--- a/img/lib/IM/Folder.pm
+++ b/img/lib/IM/Folder.pm
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::Folder.pm version 20031028(IM146)";
diff --git a/img/lib/IM/GetPass.pm b/img/lib/IM/GetPass.pm
index 662577ec..7f2df60c 100644
--- a/img/lib/IM/GetPass.pm
+++ b/img/lib/IM/GetPass.pm
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 30, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::GetPass.pm version 20031028(IM146)";
diff --git a/img/lib/IM/Grep.pm b/img/lib/IM/Grep.pm
index 72da001f..072f80b1 100644
--- a/img/lib/IM/Grep.pm
+++ b/img/lib/IM/Grep.pm
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Nov 03, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::Grep.pm version 20031028(IM146)";
diff --git a/img/lib/IM/History.pm b/img/lib/IM/History.pm
index 13eb2b27..84586902 100644
--- a/img/lib/IM/History.pm
+++ b/img/lib/IM/History.pm
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Jul 6, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::History.pm version 20031028(IM146)";
diff --git a/img/lib/IM/Http.pm b/img/lib/IM/Http.pm
index 4686bf55..af619bee 100644
--- a/img/lib/IM/Http.pm
+++ b/img/lib/IM/Http.pm
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::Http.pm version 20031028(IM146)";
diff --git a/img/lib/IM/Imap.pm b/img/lib/IM/Imap.pm
index 941c1583..5ceedfce 100644
--- a/img/lib/IM/Imap.pm
+++ b/img/lib/IM/Imap.pm
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::Imap.pm version 20031028(IM146)";
@@ -157,10 +157,10 @@ sub imap_select($$$) {
     my($seq) = $ImapSeq++;
     my($resp, @field);
     if ($select) {
-	im_notice("select mbox $mbox and getting number of message.\n");
+	im_notice("select mailbox $mbox and getting number of message.\n");
 	$resp = &send_command($HANDLE, "im$seq SELECT $mbox", '');
     } else {
-	im_notice("examine mbox $mbox and getting number of message.\n");
+	im_notice("examine mailbox $mbox and getting number of message.\n");
 	$resp = &send_command($HANDLE, "im$seq EXAMINE $mbox", '');
     }
     my $msgs = -1;
@@ -584,7 +584,7 @@ sub imap_get_msg($$$$$) {
     }
 }
 
-# IMAP folder (--src=imap[%folder][//auth][:user][@server[/port]])
+# IMAP folder (--src=imap[/auth|%folder[//auth]][:user][@server[/port]])
 sub imap_spec($) {
     my $spec = shift;
 
diff --git a/img/lib/IM/Iso2022jp.pm b/img/lib/IM/Iso2022jp.pm
index e6992a5e..d5583302 100644
--- a/img/lib/IM/Iso2022jp.pm
+++ b/img/lib/IM/Iso2022jp.pm
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::Iso2022jp.pm version 20031028(IM146)";
diff --git a/img/lib/IM/Japanese.pm b/img/lib/IM/Japanese.pm
index 84055d5f..67cd4ab8 100644
--- a/img/lib/IM/Japanese.pm
+++ b/img/lib/IM/Japanese.pm
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::Japanese.pm version 20031028(IM146)";
diff --git a/img/lib/IM/LocalMbox.pm b/img/lib/IM/LocalMbox.pm
index 70b80e13..598e8d72 100644
--- a/img/lib/IM/LocalMbox.pm
+++ b/img/lib/IM/LocalMbox.pm
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::LocalMbox.pm version 20031028(IM146)";
@@ -314,7 +314,7 @@ sub process_file($$$$) {
     my($format, $msgs, $rp, $length, $inheader, @Message);
     local(*MBOX);
 
-    im_notice("opening MBOX ($mbox)\n");
+    im_notice("opening file ($mbox)\n");
     unless (im_open(\*MBOX, "<$mbox")) {
 	# XXX not found or unreadable...
 	return -1;
@@ -346,13 +346,37 @@ sub process_mbox($$$$$) {
     my($format, $msgs, $length, $inheader, @Message);
     local(*MBOX);
     my($first_line, $FIRST_LINE);
+    my($mbox_filter);
 
-    im_info("Getting new messages from local mailbox into $dst...\n")
-	if ($how eq 'get');
-    im_warn("opening MBOX ($mbox)\n") if (&verbose);
-    unless (im_open(\*MBOX, "<$mbox")) {
-	# XXX not found or unreadable...
-	return -1;
+    if ($how eq 'get') {
+	im_info("Getting new messages from local mailbox into $dst...\n");
+    }
+    $mbox_filter = &mbox_filter();
+    if ($mbox_filter ne '') {
+	if ($mbox_filter =~ /(.+)/) {
+	    if ($main::INSECURE) {
+		im_warn("Sorry, MboxFilter is ignored for SUID root script.\n");
+		$mbox_filter = '';
+	    } else {
+		if ($> != 0) {
+		    $mbox_filter = $1; # to pass through taint check
+		}
+		im_warn("opening MBOX ($mbox_filter $mbox)\n") if (&verbose);
+		unless (im_open(\*MBOX, "$mbox_filter $mbox |")) {
+		    im_err("MboxFilter failed ($!).\n");
+		    return -1;
+		}
+	    }
+	} else {
+	    $mbox_filter = '';
+	}
+    }
+    if ($mbox_filter eq '') {
+	im_warn("opening MBOX ($mbox)\n") if (&verbose);
+	unless (im_open(\*MBOX, "<$mbox")) {
+	    # XXX not found or unreadable...
+	    return -1;
+	}
     }
     chomp($first_line = <MBOX>);
     if ($first_line =~ /^From /) {
@@ -547,7 +571,7 @@ sub local_lockmbox($$) {
     if ($type =~ /file/) {
 #	while (!sysopen(LOCK, "$base.lock", O_RDWR()|O_CREAT()|O_EXCL())) {
 #	    if ($retry >= 10) {
-#		im_warn("can't create $base.lock: $!\n");
+#		im_warn("can't create $base.lock ($!).\n");
 #		return -1;
 #	    }
 #	    im_warn("mailbox is processed by another process, waiting...\n")
@@ -557,7 +581,7 @@ sub local_lockmbox($$) {
 #	}
 
 	unless (im_open(\*LOCKFILE, ">$base.$$")) {
-	    im_warn("can't create lock file $base.$$: $!\n");
+	    im_warn("can't create lock file $base.$$ ($!).\n");
 	    im_warn("use 'flock' instead of 'file' if possible.\n");
 	    return -1;
 	}
@@ -565,7 +589,7 @@ sub local_lockmbox($$) {
 	close(LOCKFILE);
 	while (!link("$base.$$", "$base.lock")) {
 	    if ($retry >= 10) {
-		im_warn("can't create $base.lock: $!\n");
+		im_warn("can't create $base.lock ($!).\n");
 		unlink("$base.$$");
 		return -1;
 	    }
@@ -579,12 +603,12 @@ sub local_lockmbox($$) {
     }
     if ($type =~ /flock/) {
 	unless (im_open(\*LOCK_FH, "+<$base")) {
-	    im_err "can't open $base :$!\n";
+	    im_err "can't open $base ($!).\n";
 	    return -1;
 	}
 	if (! &win95p) {
 	unless (flock (LOCK_FH, LOCK_EX|LOCK_NB)) {
-	    im_warn "can't flock $base: $!\n";
+	    im_warn "can't flock $base ($!).\n";
 	    return -1;
 	}
 	}
@@ -599,7 +623,7 @@ sub local_unlockmbox($) {
     im_debug("removing lock file with uid=$> gid=$)\n") if (&debug('local'));
     if ($locked_by_file) {
 	if (-f "$base.lock" && unlink("$base.lock") <= 0) {
-	    im_warn("can't unlink lock file $base.lock: $!\n");
+	    im_warn("can't unlink lock file $base.lock ($!).\n");
 	    $rcode = -1;
 	}
 	$locked_by_file = 0;
diff --git a/img/lib/IM/Log.pm b/img/lib/IM/Log.pm
index b45f4d21..5c3b6ffa 100644
--- a/img/lib/IM/Log.pm
+++ b/img/lib/IM/Log.pm
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::Log.pm version 20031028(IM146)";
diff --git a/img/lib/IM/MD5.pm b/img/lib/IM/MD5.pm
index d7d3d8cc..5817992f 100644
--- a/img/lib/IM/MD5.pm
+++ b/img/lib/IM/MD5.pm
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::MD5.pm version 20031028(IM146)";
diff --git a/img/lib/IM/Message.pm b/img/lib/IM/Message.pm
index cbfbf544..38eb2d10 100644
--- a/img/lib/IM/Message.pm
+++ b/img/lib/IM/Message.pm
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::Message.pm version 20031028(IM146)";
@@ -735,14 +735,8 @@ sub gen_message_id($) {
     if ($main::Message_id_PID) {
 	$mid_rnd = "-".$$.$mid_rnd;
     }
-    my $mid_user;
-    if ($main::Message_id_UID) {
-	$mid_user = $<;
-    } else {
-	$mid_user = $main::Login;
-    }
     my($mid)
-      = "<$mid_time$mid_rnd.$mid_user\@$main::Message_id_domain_name>";
+      = "<$mid_time$mid_rnd.$main::Message_id_user_name\@$main::Message_id_domain_name>";
     $Mid_hist{$part} = $mid if ($part > 0);
     return $mid;
 }
diff --git a/img/lib/IM/MsgStore.pm b/img/lib/IM/MsgStore.pm
index 939ffbea..49aa728e 100644
--- a/img/lib/IM/MsgStore.pm
+++ b/img/lib/IM/MsgStore.pm
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::MsgStore.pm version 20031028(IM146)";
diff --git a/img/lib/IM/Nntp.pm b/img/lib/IM/Nntp.pm
index 87bfea19..94a82cc9 100644
--- a/img/lib/IM/Nntp.pm
+++ b/img/lib/IM/Nntp.pm
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::Nntp.pm version 20031028(IM146)";
diff --git a/img/lib/IM/Pop.pm b/img/lib/IM/Pop.pm
index 0892a2ab..c321f1ac 100644
--- a/img/lib/IM/Pop.pm
+++ b/img/lib/IM/Pop.pm
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::Pop.pm version 20031028(IM146)";
diff --git a/img/lib/IM/Recipient.pm b/img/lib/IM/Recipient.pm
index 583d7016..2ad56275 100644
--- a/img/lib/IM/Recipient.pm
+++ b/img/lib/IM/Recipient.pm
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 27, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::Recipient.pm version 20031028(IM146)";
diff --git a/img/lib/IM/Scan.pm b/img/lib/IM/Scan.pm
index deb2dbd9..5cc2ca2e 100644
--- a/img/lib/IM/Scan.pm
+++ b/img/lib/IM/Scan.pm
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::Scan.pm version 20031028(IM146)";
diff --git a/img/lib/IM/Smtp.pm b/img/lib/IM/Smtp.pm
index 2839b5c1..0478e9a5 100644
--- a/img/lib/IM/Smtp.pm
+++ b/img/lib/IM/Smtp.pm
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::Smtp.pm version 20031028(IM146)";
diff --git a/img/lib/IM/Ssh.pm b/img/lib/IM/Ssh.pm
index cc411d11..f430e266 100644
--- a/img/lib/IM/Ssh.pm
+++ b/img/lib/IM/Ssh.pm
@@ -6,7 +6,7 @@
 ### Author:  Masatoshi Tsuchiya <tsuchiya@pine.kuee.kyoto-u.ac.jp>
 ###	Internet Message Group <img@mew.org>
 ### Created: Oct 05, 1999
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::Ssh.pm version 20031028(IM146)";
diff --git a/img/lib/IM/Stdio.pm b/img/lib/IM/Stdio.pm
index 6b7be57f..05dab79c 100644
--- a/img/lib/IM/Stdio.pm
+++ b/img/lib/IM/Stdio.pm
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: May 7, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::Stdio.pm version 20031028(IM146)";
diff --git a/img/lib/IM/TcpTransaction.pm b/img/lib/IM/TcpTransaction.pm
index 0579ac29..06f16178 100644
--- a/img/lib/IM/TcpTransaction.pm
+++ b/img/lib/IM/TcpTransaction.pm
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::TcpTransaction.pm version 20031028(IM146)";
diff --git a/img/lib/IM/Util.pm b/img/lib/IM/Util.pm
index 516a88a2..03d9521e 100644
--- a/img/lib/IM/Util.pm
+++ b/img/lib/IM/Util.pm
@@ -5,7 +5,7 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Oct 28, 2003
+### Revised: Jul  4, 2004
 ###
 
 my $PM_VERSION = "IM::Util.pm version 20031028(IM146)";