import im-144im-144

27 files changed, 117 insertions, 100 deletions

diff --git a/img/lib/IM/Address.pm b/img/lib/IM/Address.pm
index 089a8b31..b63bc800 100644
--- a/img/lib/IM/Address.pm
+++ b/img/lib/IM/Address.pm
@@ -5,10 +5,10 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Dec  7, 2002
+### Revised: Mar 22, 2003
 ###
 
-my $PM_VERSION = "IM::Address.pm version 20021207(IM142)";
+my $PM_VERSION = "IM::Address.pm version 20030322(IM144)";
 
 package IM::Address;
 require 5.003;
diff --git a/img/lib/IM/Alias.pm b/img/lib/IM/Alias.pm
index ccd30b77..04a50a9f 100644
--- a/img/lib/IM/Alias.pm
+++ b/img/lib/IM/Alias.pm
@@ -5,10 +5,10 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Dec  7, 2002
+### Revised: Mar 22, 2003
 ###
 
-my $PM_VERSION = "IM::Alias.pm version 20021207(IM142)";
+my $PM_VERSION = "IM::Alias.pm version 20030322(IM144)";
 
 package IM::Alias;
 require 5.003;
diff --git a/img/lib/IM/Config.pm.in b/img/lib/IM/Config.pm.in
index 1fc3b263..7045bda6 100644
--- a/img/lib/IM/Config.pm.in
+++ b/img/lib/IM/Config.pm.in
@@ -5,10 +5,10 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Dec  7, 2002
+### Revised: Mar 22, 2003
 ###
 
-my $PM_VERSION = "IM::Config.pm version 20021207(IM142)";
+my $PM_VERSION = "IM::Config.pm version 20030322(IM144)";
 
 package IM::Config;
 require 5.003;
@@ -32,7 +32,7 @@ use vars qw(@ISA @EXPORT);
     mail_dir mail_path news_dir news_path queue_dir queue_path
     inbox_folder draft_folder trash_folder config_cases config_case_inbox
     preserve_dot
-    folder_mode msg_mode allowcrlf use_cl no_sync fsync_no
+    folder_mode msg_mode allowcrlf use_cl no_sync fsync_no preferred_fsync_no
     addrbook_file aliases_file petname_file
     context_file getchksbr_file getsbr_file scansbr_file scan_header_pick
     address addresses_regex
@@ -44,7 +44,7 @@ use vars qw(@ISA @EXPORT);
     expand_path usetouchfile touchfile namazuv2 namazu_lock_dir namazu_lock_path
     pop_timeout imap_timeout nntp_timeout dns_timeout
     connect_timeout command_timeout rcv_buf_siz
-    db_type file_attr $SSH_PATH);
+    db_type file_attr ssh_path);
 
 ##
 ## Constant
@@ -108,6 +108,7 @@ BEGIN {
     'usecl;b;;UseCL' => 'Use value of Content-Length header for delimitation',
     'nosync;b;;NoSync'		=> 'Do not need fsync(2) on writing file',
     'fsyncnumber;i;;FsyncNumber'	=> 'System call number of fsync',
+    'sshpath;s;;SshPath'		=> 'Path name of SSH program',
     'allowcrlf;b;;AllowCRLF'		=> 'CRLF may be in saved message',
     'preservedot;b;;PreserveDot'	=> 'Not substitute "." with "/"',
     'addrbookfile;s;;AddrBookFile'      => 'Address book file',
@@ -801,7 +802,11 @@ sub no_sync() {
 }
 
 sub fsync_no() {
-    return $FsyncNumber || $FSYNC_NO;
+    return $FSYNC_NO;
+}
+
+sub preferred_fsync_no() {
+    return $FsyncNumber;
 }
 
 sub addrbook_file() {
@@ -956,6 +961,10 @@ sub db_type() {
     return $IM_DB_TYPE;
 }
 
+sub ssh_path() {
+    return $SshPath || $SSH_PATH;
+}
+
 sub namazuv2() {
     return $NamazuV2;
 }
@@ -1098,7 +1107,7 @@ home_dir conf_dir
 mail_dir mail_path news_dir news_path queue_dir queue_path
 inbox_folder draft_folder trash_folder config_cases config_case_inbox
 preserve_dot
-folder_mode msg_mode allowcrlf use_cl no_sync fsync_no
+folder_mode msg_mode allowcrlf use_cl no_sync fsync_no preferred_fsync_no
 addrbook_file aliases_file petname_file
 context_file getchksbr_file getsbr_file scansbr_file scan_header_pick
 address addresses_regex
@@ -1110,7 +1119,7 @@ usepwagent pwagentport pwagent_tmp_dir pwagent_tmp_path usepwfiles pwfiles
 expand_path usetouchfile touchfile namazuv2 namazu_lock_dir namazu_lock_path
 pop_timeout imap_timeout nntp_timeout dns_timeout
 connect_timeout command_timeout rcv_buf_siz
-db_type file_attr
+db_type file_attr ssh_path
 
 =head1 DESCRIPTION
 
diff --git a/img/lib/IM/EncDec.pm b/img/lib/IM/EncDec.pm
index 11ac71cb..713a638a 100644
--- a/img/lib/IM/EncDec.pm
+++ b/img/lib/IM/EncDec.pm
@@ -5,10 +5,10 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Dec  7, 2002
+### Revised: Mar 22, 2003
 ###
 
-my $PM_VERSION = "IM::EncDec.pm version 20021207(IM142)";
+my $PM_VERSION = "IM::EncDec.pm version 20030322(IM144)";
 
 package IM::EncDec;
 require 5.003;
diff --git a/img/lib/IM/File.pm b/img/lib/IM/File.pm
index 303ab310..9ffb7fb9 100644
--- a/img/lib/IM/File.pm
+++ b/img/lib/IM/File.pm
@@ -5,10 +5,10 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Jul  7, 1997
-### Revised: Dec  7, 2002
+### Revised: Mar 22, 2003
 ###
 
-my $PM_VERSION = "IM::File.pm version 20021207(IM142)";
+my $PM_VERSION = "IM::File.pm version 20030322(IM144)";
 
 package IM::File;
 require 5.003;
diff --git a/img/lib/IM/Folder.pm b/img/lib/IM/Folder.pm
index 6170a4ee..c8566742 100644
--- a/img/lib/IM/Folder.pm
+++ b/img/lib/IM/Folder.pm
@@ -5,10 +5,10 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Dec  7, 2002
+### Revised: Mar 22, 2003
 ###
 
-my $PM_VERSION = "IM::Folder.pm version 20021207(IM142)";
+my $PM_VERSION = "IM::Folder.pm version 20030322(IM144)";
 
 package IM::Folder;
 require 5.003;
diff --git a/img/lib/IM/GetPass.pm b/img/lib/IM/GetPass.pm
index 6c4caf5f..050b2470 100644
--- a/img/lib/IM/GetPass.pm
+++ b/img/lib/IM/GetPass.pm
@@ -5,10 +5,10 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 30, 1997
-### Revised: Dec  7, 2002
+### Revised: Mar 22, 2003
 ###
 
-my $PM_VERSION = "IM::GetPass.pm version 20021207(IM142)";
+my $PM_VERSION = "IM::GetPass.pm version 20030322(IM144)";
 
 package IM::GetPass;
 require 5.003;
diff --git a/img/lib/IM/Grep.pm b/img/lib/IM/Grep.pm
index 20cfb878..aadaecda 100644
--- a/img/lib/IM/Grep.pm
+++ b/img/lib/IM/Grep.pm
@@ -5,10 +5,10 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Nov 03, 1997
-### Revised: Dec  7, 2002
+### Revised: Mar 22, 2003
 ###
 
-my $PM_VERSION = "IM::Grep.pm version 20021207(IM142)";
+my $PM_VERSION = "IM::Grep.pm version 20030322(IM144)";
 
 package IM::Grep;
 require 5.003;
diff --git a/img/lib/IM/History.pm b/img/lib/IM/History.pm
index 0fd358c2..6ea54363 100644
--- a/img/lib/IM/History.pm
+++ b/img/lib/IM/History.pm
@@ -5,10 +5,10 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Jul 6, 1997
-### Revised: Dec  7, 2002
+### Revised: Mar 22, 2003
 ###
 
-my $PM_VERSION = "IM::History.pm version 20021207(IM142)";
+my $PM_VERSION = "IM::History.pm version 20030322(IM144)";
 
 package IM::History;
 require 5.003;
diff --git a/img/lib/IM/Http.pm b/img/lib/IM/Http.pm
index 34949b61..5e63cfa9 100644
--- a/img/lib/IM/Http.pm
+++ b/img/lib/IM/Http.pm
@@ -5,10 +5,10 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Dec  7, 2002
+### Revised: Mar 22, 2003
 ###
 
-my $PM_VERSION = "IM::Http.pm version 20021207(IM142)";
+my $PM_VERSION = "IM::Http.pm version 20030322(IM144)";
 
 package IM::Http;
 require 5.003;
diff --git a/img/lib/IM/Imap.pm b/img/lib/IM/Imap.pm
index cdd056d6..533ab42b 100644
--- a/img/lib/IM/Imap.pm
+++ b/img/lib/IM/Imap.pm
@@ -5,10 +5,10 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Dec  7, 2002
+### Revised: Mar 22, 2003
 ###
 
-my $PM_VERSION = "IM::Imap.pm version 20021207(IM142)";
+my $PM_VERSION = "IM::Imap.pm version 20030322(IM144)";
 
 package IM::Imap;
 require 5.003;
@@ -534,7 +534,7 @@ sub imap_process($$$$$$$) {
 	}
     } elsif ($how eq 'get') {
 	if ($msgs > 0) {
-	    im_info("Getting new messages from $host into $dst....\n");
+	    im_info("Getting new messages from $src at $host into $dst...\n");
 	    my @alluids = &imap_all_uids($HANDLE);
 	    return -1 if ($alluids[0] < 0);
 	    my $i;
diff --git a/img/lib/IM/Iso2022jp.pm b/img/lib/IM/Iso2022jp.pm
index bcb37bfb..56e97ac3 100644
--- a/img/lib/IM/Iso2022jp.pm
+++ b/img/lib/IM/Iso2022jp.pm
@@ -5,10 +5,10 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Dec  7, 2002
+### Revised: Mar 22, 2003
 ###
 
-my $PM_VERSION = "IM::Iso2022jp.pm version 20021207(IM142)";
+my $PM_VERSION = "IM::Iso2022jp.pm version 20030322(IM144)";
 
 package IM::Iso2022jp;
 require 5.003;
diff --git a/img/lib/IM/Japanese.pm b/img/lib/IM/Japanese.pm
index f0e1e1bb..165dae76 100644
--- a/img/lib/IM/Japanese.pm
+++ b/img/lib/IM/Japanese.pm
@@ -5,10 +5,10 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Dec  7, 2002
+### Revised: Mar 22, 2003
 ###
 
-my $PM_VERSION = "IM::Japanese.pm version 20021207(IM142)";
+my $PM_VERSION = "IM::Japanese.pm version 20030322(IM144)";
 
 package IM::Japanese;
 require 5.003;
diff --git a/img/lib/IM/LocalMbox.pm b/img/lib/IM/LocalMbox.pm
index 1c27bbee..c260b43a 100644
--- a/img/lib/IM/LocalMbox.pm
+++ b/img/lib/IM/LocalMbox.pm
@@ -5,10 +5,10 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Dec  7, 2002
+### Revised: Mar 22, 2003
 ###
 
-my $PM_VERSION = "IM::LocalMbox.pm version 20021207(IM142)";
+my $PM_VERSION = "IM::LocalMbox.pm version 20030322(IM144)";
 
 package IM::LocalMbox;
 require 5.003;
@@ -119,7 +119,7 @@ sub local_get_msg($$$$$) {
 
     if (-d $mbox) {
 	# DIRECTORY
-	im_info("Getting new messages from maildir into $dst....\n")
+	im_info("Getting new messages from maildir into $dst...\n")
 	  if ($how eq 'get');
 
 	my $msgs = 0;
@@ -339,7 +339,7 @@ sub process_mbox($$$$$) {
     local(*MBOX);
     my($first_line, $FIRST_LINE);
 
-    im_info("Getting new messages from local mailbox into $dst....\n")
+    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")) {
diff --git a/img/lib/IM/Log.pm b/img/lib/IM/Log.pm
index 256fe9da..fb2e479a 100644
--- a/img/lib/IM/Log.pm
+++ b/img/lib/IM/Log.pm
@@ -5,10 +5,10 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Dec  7, 2002
+### Revised: Mar 22, 2003
 ###
 
-my $PM_VERSION = "IM::Log.pm version 20021207(IM142)";
+my $PM_VERSION = "IM::Log.pm version 20030322(IM144)";
 
 package IM::Log;
 require 5.003;
diff --git a/img/lib/IM/MD5.pm b/img/lib/IM/MD5.pm
index 3c995b28..1cbc4599 100644
--- a/img/lib/IM/MD5.pm
+++ b/img/lib/IM/MD5.pm
@@ -5,10 +5,10 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Dec  7, 2002
+### Revised: Mar 22, 2003
 ###
 
-my $PM_VERSION = "IM::MD5.pm version 20021207(IM142)";
+my $PM_VERSION = "IM::MD5.pm version 20030322(IM144)";
 
 package IM::MD5;
 require 5.003;
diff --git a/img/lib/IM/Message.pm b/img/lib/IM/Message.pm
index 04d8e4e4..cc9dca80 100644
--- a/img/lib/IM/Message.pm
+++ b/img/lib/IM/Message.pm
@@ -5,10 +5,10 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Dec  7, 2002
+### Revised: Mar 22, 2003
 ###
 
-my $PM_VERSION = "IM::Message.pm version 20021207(IM142)";
+my $PM_VERSION = "IM::Message.pm version 20030322(IM144)";
 
 package IM::Message;
 require 5.003;
diff --git a/img/lib/IM/MsgStore.pm b/img/lib/IM/MsgStore.pm
index 9e100293..d1789803 100644
--- a/img/lib/IM/MsgStore.pm
+++ b/img/lib/IM/MsgStore.pm
@@ -5,10 +5,10 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Dec  7, 2002
+### Revised: Mar 22, 2003
 ###
 
-my $PM_VERSION = "IM::MsgStore.pm version 20021207(IM142)";
+my $PM_VERSION = "IM::MsgStore.pm version 20030322(IM144)";
 
 package IM::MsgStore;
 require 5.003;
@@ -16,7 +16,7 @@ require Exporter;
 
 use Fcntl;
 use IM::Config qw(getsbr_file msg_mode msgdbfile expand_path
-		  inbox_folder no_sync fsync_no file_attr);
+		  inbox_folder no_sync fsync_no preferred_fsync_no file_attr);
 use IM::Util;
 use IM::Folder qw(message_number message_name create_folder touch_folder);
 use IM::Message qw(gen_date);
@@ -294,26 +294,21 @@ sub excl_create(*$) {
 sub fsync($) {
     my $fno = shift;
 
-    if (fsync_no()) {
-	# try to use SYS_sync number detected when configure
-	return syscall(fsync_no(), $fno);
+    if (preferred_fsync_no()) {
+	return syscall(preferred_fsync_no(), $fno);
     }
-
-    # otherwise, try to find from header files
+    # try to find from header files
     unless (defined($sys_fsync)) {
-	my $inc = 'syscall.ph';		# only for BSDs?
-	my $prefix;
-	if (-f '/usr/include/sys.s') {	# for IRIX...
-	    # create sys.ph from sys.s
-	    require 'sys.ph';
+	eval { require 'syscall.ph'; };
+	unless ($@) {
 	    $sys_fsync = &SYS_fsync if (defined(&SYS_fsync));
 	}
 	unless ($sys_fsync) {
-	    foreach $prefix (@INC) {
-		if (-f "$prefix/$inc") {
-		    require "$prefix/$inc";
+	    if (-f '/usr/include/sys.s') {  # for IRIX...
+		# create sys.ph from sys.s
+		eval { require 'sys.ph'; };
+		unless ($@) {
 		    $sys_fsync = &SYS_fsync if (defined(&SYS_fsync));
-		    last;
 		}
 	    }
 	}
@@ -330,6 +325,10 @@ sub fsync($) {
 	    }
 	}
 	unless ($sys_fsync) {
+	    # try to use SYS_fsync number detected when configure
+	    $sys_fsync = fsync_no();
+	}
+	unless ($sys_fsync) {
 	    im_die("Can't find a way to fsync(). Set NoSync=yes in your Config file and be careful on file system overflow if your mail folders are on NFS.\n");
 	}
     }
diff --git a/img/lib/IM/Nntp.pm b/img/lib/IM/Nntp.pm
index 9751d9c5..23b569ac 100644
--- a/img/lib/IM/Nntp.pm
+++ b/img/lib/IM/Nntp.pm
@@ -5,10 +5,10 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Dec  7, 2002
+### Revised: Mar 22, 2003
 ###
 
-my $PM_VERSION = "IM::Nntp.pm version 20021207(IM142)";
+my $PM_VERSION = "IM::Nntp.pm version 20030322(IM144)";
 
 package IM::Nntp;
 require 5.003;
@@ -97,7 +97,7 @@ sub nntp_close() {
 #	group: news group to be posted in
 #	part: part number to be sent in partial message mode
 #	total: total number of partial messages
-#       authuser: User name for NNTP authentication
+#	authuser: User name for NNTP authentication
 #	return value:
 #		 0: success
 #		 1: recoverable error (should be retried)
@@ -558,13 +558,13 @@ sub nntp_get_msg($$$$) {
 
     if ($how eq 'from') {
 	if ($msgs > 0) {
-	    $msgs = &nntp_xover ($art_start, $art_end);
-	    $msgs = &nntp_head ($art_start, $art_end) if ($msgs < 0);
+	    $msgs = &nntp_xover($art_start, $art_end);
+	    $msgs = &nntp_head($art_start, $art_end) if ($msgs < 0);
 	    if ($msgs < 0) {
 		im_warn("can not get article poster information.\n");
 		return -1;
 	    }
-	im_info("$msgs article(s) in $group at $servers.\n");
+	    im_info("$msgs article(s) in $group at $servers.\n");
 	} else {
 	    im_info("no news in $group at $servers.\n");
 	}
@@ -575,8 +575,7 @@ sub nntp_get_msg($$$$) {
     if ($how eq 'get') {
 	my($last);
 	if ($msgs > 0) {
-	    im_info("Getting new messages from $group at $servers "
-	      . "into $dst....\n");
+	    im_info("Getting new messages from $group at $servers into $dst...\n");
 	    ($msgs, $last) = &nntp_articles($art_start, $art_end, $dst, $limit);
 	    if ($msgs < 0) {
 		im_warn("can not get articles.\n");
diff --git a/img/lib/IM/Pop.pm b/img/lib/IM/Pop.pm
index 8486edaa..9e8a5618 100644
--- a/img/lib/IM/Pop.pm
+++ b/img/lib/IM/Pop.pm
@@ -5,10 +5,10 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Dec  7, 2002
+### Revised: Mar 22, 2003
 ###
 
-my $PM_VERSION = "IM::Pop.pm version 20021207(IM142)";
+my $PM_VERSION = "IM::Pop.pm version 20030322(IM144)";
 
 package IM::Pop;
 require 5.003;
@@ -456,7 +456,7 @@ sub pop_inc($$$$$$$$) {
 	}
     }
 
-    im_info("Getting new messages into $dst....\n");
+    im_info("Getting new messages from $host into $dst...\n");
     for ($i = $last; $i <= $msgs; $i++) {
 	if ($getchk_hook ne '') {
 	    $head = &pop_head($i);
diff --git a/img/lib/IM/Recipient.pm b/img/lib/IM/Recipient.pm
index 7cec8467..e97c425e 100644
--- a/img/lib/IM/Recipient.pm
+++ b/img/lib/IM/Recipient.pm
@@ -5,10 +5,10 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 27, 1997
-### Revised: Dec  7, 2002
+### Revised: Mar 22, 2003
 ###
 
-my $PM_VERSION = "IM::Recipient.pm version 20021207(IM142)";
+my $PM_VERSION = "IM::Recipient.pm version 20030322(IM144)";
 
 package IM::Recipient;
 require 5.003;
diff --git a/img/lib/IM/Scan.pm b/img/lib/IM/Scan.pm
index c31c0e69..07407f84 100644
--- a/img/lib/IM/Scan.pm
+++ b/img/lib/IM/Scan.pm
@@ -5,10 +5,10 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Dec  7, 2002
+### Revised: Mar 22, 2003
 ###
 
-my $PM_VERSION = "IM::Scan.pm version 20021207(IM142)";
+my $PM_VERSION = "IM::Scan.pm version 20030322(IM144)";
 
 package IM::Scan;
 require 5.003;
@@ -256,17 +256,21 @@ sub parse_body(*$) {
 	}
 	last unless defined($_);
 
-	next if /^#/;
 	next if /^\s*\n/;
 	next if /^--/;
 	next if /^- --/;
+	next if /^=2D/;
 	next if /^\s+[\w*-]+=/;		# eg. "boundary="; * = RFC2231
 	next if /^\s*[\w-]+: /;		# Headers and header style citation
-	next if /^\s*[\w-]*[>|]/;	# other citation
-	next if /:\n$/;
-	next if /^This is a multi-part message in MIME format./i;
-
-	if (/^In message/ || /^In article/ || /^In <.*>/) {
+	next if /^\s*[>:|\/_}]/;	# other citation
+	next if /^  /;
+	next if /^\s*\w+([\'._-]+\w+)*>/;
+	next if /^\s*(On|At) .*[^.!\s\n]\s*$/;
+        next if /(:|;|\/)\s*\n$/;
+        next if /(wrote|writes?|said|says?)[^.!\n]?\s*\n$/;
+	next if /^This is a multi-part message in MIME format/i;
+
+	if (/^\s*In (message|article|<|\")/i) {
 	    if ($mode == 0) {
 		$_ = <HANDLE>;
 	    } else {
diff --git a/img/lib/IM/Smtp.pm b/img/lib/IM/Smtp.pm
index af730a06..1826cf02 100644
--- a/img/lib/IM/Smtp.pm
+++ b/img/lib/IM/Smtp.pm
@@ -5,10 +5,10 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Dec  7, 2002
+### Revised: Mar 22, 2003
 ###
 
-my $PM_VERSION = "IM::Smtp.pm version 20021207(IM142)";
+my $PM_VERSION = "IM::Smtp.pm version 20030322(IM144)";
 
 package IM::Smtp;
 require 5.003;
diff --git a/img/lib/IM/Ssh.pm b/img/lib/IM/Ssh.pm
index 404a8f78..cbdbb3c6 100644
--- a/img/lib/IM/Ssh.pm
+++ b/img/lib/IM/Ssh.pm
@@ -6,15 +6,15 @@
 ### Author:  Masatoshi Tsuchiya <tsuchiya@pine.kuee.kyoto-u.ac.jp>
 ###	Internet Message Group <img@mew.org>
 ### Created: Oct 05, 1999
-### Revised: Dec  7, 2002
+### Revised: Mar 22, 2003
 ###
 
-my $PM_VERSION = "IM::Ssh.pm version 20021207(IM142)";
+my $PM_VERSION = "IM::Ssh.pm version 20030322(IM144)";
 
 package IM::Ssh;
 require 5.003;
 require Exporter;
-use IM::Config qw(connect_timeout command_timeout $SSH_PATH);
+use IM::Config qw(connect_timeout command_timeout ssh_path);
 use IM::Util;
 use strict;
 use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $SSH $FH @PID);
@@ -27,6 +27,7 @@ $FH      = "SSH00000";
 
 sub ssh_proxy($$$$) {
     my($server, $remote, $local, $host) = @_;
+    my $prog = ssh_path();
 
     unless ($host) {
 	im_err("Missing relay host.\n");
@@ -72,7 +73,7 @@ sub ssh_proxy($$$$) {
 	    close $read;
 	    open(STDOUT, ">&$write");
 	    open(STDERR, ">&$write");
- 	    exec($SSH_PATH, '-n', '-x', '-o', 'BatchMode yes',
+ 	    exec($prog, '-n', '-x', '-o', 'BatchMode yes',
 		 "-L$local:$server:$remote", $host,
 		 sprintf('echo ssh_proxy_connect ; sleep %s',
 			 &command_timeout()));
@@ -81,7 +82,7 @@ sub ssh_proxy($$$$) {
 	    sleep 5;
 	    redo FORK;
 	} else {
-	    im_warn("Can't fork $SSH_PATH.\n");
+	    im_warn("Can't fork $prog.\n");
 	}
     }
     0;
diff --git a/img/lib/IM/Stdio.pm b/img/lib/IM/Stdio.pm
index 7d4d9808..645f1c0d 100644
--- a/img/lib/IM/Stdio.pm
+++ b/img/lib/IM/Stdio.pm
@@ -5,10 +5,10 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: May 7, 1997
-### Revised: Dec  7, 2002
+### Revised: Mar 22, 2003
 ###
 
-my $PM_VERSION = "IM::Stdio.pm version 20021207(IM142)";
+my $PM_VERSION = "IM::Stdio.pm version 20030322(IM144)";
 
 package IM::Stdio;
 require 5.003;
diff --git a/img/lib/IM/TcpTransaction.pm b/img/lib/IM/TcpTransaction.pm
index 63d6599c..b0ee4b32 100644
--- a/img/lib/IM/TcpTransaction.pm
+++ b/img/lib/IM/TcpTransaction.pm
@@ -5,10 +5,10 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Dec  7, 2002
+### Revised: Mar 22, 2003
 ###
 
-my $PM_VERSION = "IM::TcpTransaction.pm version 20021207(IM142)";
+my $PM_VERSION = "IM::TcpTransaction.pm version 20030322(IM144)";
 
 package IM::TcpTransaction;
 require 5.003;
diff --git a/img/lib/IM/Util.pm b/img/lib/IM/Util.pm
index 68da1a5e..90c98b89 100644
--- a/img/lib/IM/Util.pm
+++ b/img/lib/IM/Util.pm
@@ -5,10 +5,10 @@
 ###
 ### Author:  Internet Message Group <img@mew.org>
 ### Created: Apr 23, 1997
-### Revised: Dec  7, 2002
+### Revised: Mar 22, 2003
 ###
 
-my $PM_VERSION = "IM::Util.pm version 20021207(IM142)";
+my $PM_VERSION = "IM::Util.pm version 20030322(IM144)";
 
 package IM::Util;
 require 5.003;
@@ -48,13 +48,18 @@ $EXIT_ERROR = 1;
 
 my $osname = $^O;
 
-if ($osname =~ /win/i) {
-    if (Win32::IsWinNT()) {
-	$OS = 'WNT';
-    } elsif (Win32::IsWin95()) {
-	$OS = 'WIN95';
-    } else {
-	$OS = 'WIN95';		# xxx
+if ($osname =~ /win/i && $osname !~ /darwin/i) {
+    eval {
+	if (Win32::IsWinNT()) {
+	    $OS = 'WNT';
+	} elsif (Win32::IsWin95()) {
+	    $OS = 'WIN95';
+	} else {
+	    $OS = 'WIN95';	# xxx
+	}
+    };
+    if ($@) {
+	$OS = 'UNIX';
     }
 } elsif ($osname =~ /os2/i) {
     $OS = 'OS/2';