import im-153im-153

27 files changed, 83 insertions, 44 deletions

diff --git a/img/lib/IM/Address.pm b/img/lib/IM/Address.pm
index 2cae7ec2..e7c25f9a 100644
--- a/img/lib/IM/Address.pm
+++ b/img/lib/IM/Address.pm
@@ -8,7 +8,7 @@
 ### Revised: Apr 23, 2007
 ###
 
-my $PM_VERSION = "IM::Address.pm version 20100215(IM150)";
+my $PM_VERSION = "IM::Address.pm version 20161010(IM153)";
 
 package IM::Address;
 require 5.003;
diff --git a/img/lib/IM/Alias.pm b/img/lib/IM/Alias.pm
index 6c4175c9..0ec4cb07 100644
--- a/img/lib/IM/Alias.pm
+++ b/img/lib/IM/Alias.pm
@@ -8,7 +8,7 @@
 ### Revised: Apr 23, 2007
 ###
 
-my $PM_VERSION = "IM::Alias.pm version 20100215(IM150)";
+my $PM_VERSION = "IM::Alias.pm version 20161010(IM153)";
 
 package IM::Alias;
 require 5.003;
diff --git a/img/lib/IM/Config.pm.in b/img/lib/IM/Config.pm.in
index 13728bf7..e1731207 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: Apr 23, 2007
+### Revised: May 25, 2011
 ###
 
-my $PM_VERSION = "IM::Config.pm version 20100215(IM150)";
+my $PM_VERSION = "IM::Config.pm version 20161010(IM153)";
 
 package IM::Config;
 require 5.003;
@@ -39,7 +39,7 @@ use vars qw(@ISA @EXPORT);
     msgdbfile msgdbtype
     mbox_style mbox_filter
     nntpservers nntphistoryfile nntpauthuser set_nntpauthuser
-    popaccount pophistoryfile imapaccount httpproxy noproxy
+    popaccount pophistoryfile imapaccount smtpaccount httpproxy noproxy
     usepwagent pwagentport pwagent_tmp_dir pwagent_tmp_path usepwfiles pwfiles
     expand_path use_xdispatcher usetouchfile touchfile
     namazuv2 namazu_dir namazu_path namazu_lock_dir namazu_lock_path
@@ -58,7 +58,7 @@ use vars qw($CURRENT_DIR $HOME_DIR $IM_SYS_DIR
 	    $O_FOPT %C_DESC %C_VNAM
 	    %WHO_SET
 	    @SELECTORS
-	    $IM_LIBDIR $IM_DB_TYPE $FSYNC_NO
+	    $IM_SYSCONFDIR $IM_DB_TYPE $FSYNC_NO
 	    $prefix $exec_prefix $SSH_PATH);
 
 ##
@@ -67,7 +67,7 @@ use vars qw($CURRENT_DIR $HOME_DIR $IM_SYS_DIR
 
 $prefix="@prefix@";
 $exec_prefix= "@exec_prefix@";
-$IM_LIBDIR  = "@libdir@/im";
+$IM_SYSCONFDIR  = "@sysconfdir@/im";
 $IM_DB_TYPE = '@im_db_type@';
 $FSYNC_NO = @im_fsync_no@;
 $SSH_PATH = "@im_path_ssh@";
@@ -87,7 +87,7 @@ $HOME_DIR = $ENV{'HOME'} || $ENV{'LOGDIR'} || (getpwuid($<))[7] ||
 $HOME_DIR =~ s:\\:/:g;     # "\home\user" -> "/home/user"
 $HOME_DIR =~ s/\/$//;      # "/home/" -> "/home"
 
-$IM_SYS_DIR = $ENV{'IM_SYS_DIR'} || "$IM_LIBDIR";
+$IM_SYS_DIR = $ENV{'IM_SYS_DIR'} || "$IM_SYSCONFDIR";
 $IM_USER_DIR = &expand_home($ENV{'IM_USER_DIR'} || '.im');
 
 $IM_SYS_PROFILE = "$IM_SYS_DIR/SiteConfig";
@@ -135,6 +135,7 @@ BEGIN {
     'popaccount;s;;POPaccount'		=> 'Account info for POP access',
     'pophistory;s;;POPhistory'		=> 'Status file of POP access',
     'imapaccount;s;;IMAPaccount'	=> 'Account info for IMAP access',
+    'smtpaccount;s;;SMTPaccount'	=> 'Account info for SMTP authentication',
     'httpproxy;s;;HTTPproxy'		=> 'Proxy server for HTTP access',
     'noproxy;s;;Noproxy'		=> 'URL regex not to use Proxy server',
     'usepwagent;b;;UsePwAgent'		=> 'Use password agent',
@@ -362,7 +363,7 @@ sub read_cfg() {
 	    s/\s*$//;
 	    if (/^case\s*(.*)/) {
 		($case = $1) =~ s/\s*//g;
-		# make sure defined(%{$case}) is true
+		# make sure %{$case} is true
 		foreach (split(',', $case)) {
 		    $_->{0} = '';
 		    delete $_->{0};
@@ -487,7 +488,7 @@ sub set_selector($;$) {
 
     foreach $s (split(',', $selector)) { ### xxx lc
 	next if ($s eq 'default');
-	unless (defined(%{$s})) {
+	unless (%{$s}) {
 	    im_err("no 'case $s' in config file.\n");
 	    return -1;
 	} else {
@@ -564,7 +565,7 @@ sub help($) {
     if ($O_FOPT) {
 	print "\nNote that +xxx is equivalent to $O_FOPT=+xxx.\n";
     }
-    print "\nReport bugs to <img\@mew.org>.\n";
+    print "\nReport bugs to <tats\@vega.ocn.ne.jp>.\n";
     return 1;
 }
 
@@ -576,7 +577,7 @@ sub set_value_cfg($$$) {
     my($name, $val, $case) = @_;
     my($mnam, $desc, $vnam);
 
-    $val =~ s/\${(\w+)}/$ENV{$1}/ge;
+    $val =~ s/\$\{(\w+)\}/$ENV{$1}/ge;
     if ($val =~ /^\$(.*)/) {
 	# $InboxFolder -> +inbox
 	$val = ${$C_VNAM{lc($1)}};
@@ -907,6 +908,10 @@ sub imapaccount() {
     return $IMAPaccount;
 }
 
+sub smtpaccount() {
+    return $SMTPaccount;
+}
+
 sub httpproxy() {
     return $HTTPproxy;
 }
@@ -1163,7 +1168,7 @@ address addresses_regex
 msgdbfile msgdbtype
 mbox_style mbox_filter
 nntpservers nntphistoryfile nntpauthuser set_nntpauthuser
-popaccount pophistoryfile imapaccount httpproxy noproxy
+popaccount pophistoryfile imapaccount smtpaccount httpproxy noproxy
 usepwagent pwagentport pwagent_tmp_dir pwagent_tmp_path usepwfiles pwfiles
 expand_path use_xdispatcher usetouchfile touchfile
 namazuv2 namazu_dir namazu_path namazu_lock_dir namazu_lock_path
diff --git a/img/lib/IM/EncDec.pm b/img/lib/IM/EncDec.pm
index 5126b9b3..7ff09a80 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: Apr 23, 2007
+### Revised: Feb 15, 2010
 ###
 
-my $PM_VERSION = "IM::EncDec.pm version 20100215(IM150)";
+my $PM_VERSION = "IM::EncDec.pm version 20161010(IM153)";
 
 package IM::EncDec;
 require 5.003;
@@ -217,8 +217,8 @@ sub cn_gb_to_ctext($) {
 sub hz_to_ctext($) {
     my $str = shift;
     $str =~ s/(~~)/~/g;
-    $str =~ s/(~{)/\e\$(A/g;
-    $str =~ s/(~})/\e(B/g;
+    $str =~ s/(~\{)/\e\$(A/g;
+    $str =~ s/(~\})/\e(B/g;
     return $str;
 }
 
diff --git a/img/lib/IM/File.pm b/img/lib/IM/File.pm
index 4cd017c7..66bf0607 100644
--- a/img/lib/IM/File.pm
+++ b/img/lib/IM/File.pm
@@ -8,7 +8,7 @@
 ### Revised: Apr 23, 2007
 ###
 
-my $PM_VERSION = "IM::File.pm version 20100215(IM150)";
+my $PM_VERSION = "IM::File.pm version 20161010(IM153)";
 
 package IM::File;
 require 5.003;
diff --git a/img/lib/IM/Folder.pm b/img/lib/IM/Folder.pm
index b57ca49d..3746985a 100644
--- a/img/lib/IM/Folder.pm
+++ b/img/lib/IM/Folder.pm
@@ -8,7 +8,7 @@
 ### Revised: Apr 23, 2007
 ###
 
-my $PM_VERSION = "IM::Folder.pm version 20100215(IM150)";
+my $PM_VERSION = "IM::Folder.pm version 20161010(IM153)";
 
 package IM::Folder;
 require 5.003;
diff --git a/img/lib/IM/GetPass.pm b/img/lib/IM/GetPass.pm
index 3f77eda8..0d091ad2 100644
--- a/img/lib/IM/GetPass.pm
+++ b/img/lib/IM/GetPass.pm
@@ -8,7 +8,7 @@
 ### Revised: Apr 23, 2007
 ###
 
-my $PM_VERSION = "IM::GetPass.pm version 20100215(IM150)";
+my $PM_VERSION = "IM::GetPass.pm version 20161010(IM153)";
 
 package IM::GetPass;
 require 5.003;
diff --git a/img/lib/IM/Grep.pm b/img/lib/IM/Grep.pm
index ae217b22..37887e45 100644
--- a/img/lib/IM/Grep.pm
+++ b/img/lib/IM/Grep.pm
@@ -8,7 +8,7 @@
 ### Revised: Apr 23, 2007
 ###
 
-my $PM_VERSION = "IM::Grep.pm version 20100215(IM150)";
+my $PM_VERSION = "IM::Grep.pm version 20161010(IM153)";
 
 package IM::Grep;
 require 5.003;
diff --git a/img/lib/IM/History.pm b/img/lib/IM/History.pm
index 2c98175a..d50576a5 100644
--- a/img/lib/IM/History.pm
+++ b/img/lib/IM/History.pm
@@ -8,7 +8,7 @@
 ### Revised: Apr 23, 2007
 ###
 
-my $PM_VERSION = "IM::History.pm version 20100215(IM150)";
+my $PM_VERSION = "IM::History.pm version 20161010(IM153)";
 
 package IM::History;
 require 5.003;
diff --git a/img/lib/IM/Http.pm b/img/lib/IM/Http.pm
index 61ba52dd..b0188ad0 100644
--- a/img/lib/IM/Http.pm
+++ b/img/lib/IM/Http.pm
@@ -8,7 +8,7 @@
 ### Revised: Apr 23, 2007
 ###
 
-my $PM_VERSION = "IM::Http.pm version 20100215(IM150)";
+my $PM_VERSION = "IM::Http.pm version 20161010(IM153)";
 
 package IM::Http;
 require 5.003;
diff --git a/img/lib/IM/Imap.pm b/img/lib/IM/Imap.pm
index 1e236833..07d0317a 100644
--- a/img/lib/IM/Imap.pm
+++ b/img/lib/IM/Imap.pm
@@ -8,7 +8,7 @@
 ### Revised: Apr 23, 2007
 ###
 
-my $PM_VERSION = "IM::Imap.pm version 20100215(IM150)";
+my $PM_VERSION = "IM::Imap.pm version 20161010(IM153)";
 
 package IM::Imap;
 require 5.003;
diff --git a/img/lib/IM/Iso2022jp.pm b/img/lib/IM/Iso2022jp.pm
index 4a2a97df..acee655d 100644
--- a/img/lib/IM/Iso2022jp.pm
+++ b/img/lib/IM/Iso2022jp.pm
@@ -8,7 +8,7 @@
 ### Revised: Apr 23, 2007
 ###
 
-my $PM_VERSION = "IM::Iso2022jp.pm version 20100215(IM150)";
+my $PM_VERSION = "IM::Iso2022jp.pm version 20161010(IM153)";
 
 package IM::Iso2022jp;
 require 5.003;
diff --git a/img/lib/IM/Japanese.pm b/img/lib/IM/Japanese.pm
index d150c30b..1bd22664 100644
--- a/img/lib/IM/Japanese.pm
+++ b/img/lib/IM/Japanese.pm
@@ -8,7 +8,7 @@
 ### Revised: Apr 23, 2007
 ###
 
-my $PM_VERSION = "IM::Japanese.pm version 20100215(IM150)";
+my $PM_VERSION = "IM::Japanese.pm version 20161010(IM153)";
 
 package IM::Japanese;
 require 5.003;
diff --git a/img/lib/IM/LocalMbox.pm b/img/lib/IM/LocalMbox.pm
index d5674b41..0168ade4 100644
--- a/img/lib/IM/LocalMbox.pm
+++ b/img/lib/IM/LocalMbox.pm
@@ -8,7 +8,7 @@
 ### Revised: Apr 23, 2007
 ###
 
-my $PM_VERSION = "IM::LocalMbox.pm version 20100215(IM150)";
+my $PM_VERSION = "IM::LocalMbox.pm version 20161010(IM153)";
 
 package IM::LocalMbox;
 require 5.003;
diff --git a/img/lib/IM/Log.pm b/img/lib/IM/Log.pm
index f3453189..0dd0c9f0 100644
--- a/img/lib/IM/Log.pm
+++ b/img/lib/IM/Log.pm
@@ -8,7 +8,7 @@
 ### Revised: Apr 23, 2007
 ###
 
-my $PM_VERSION = "IM::Log.pm version 20100215(IM150)";
+my $PM_VERSION = "IM::Log.pm version 20161010(IM153)";
 
 package IM::Log;
 require 5.003;
diff --git a/img/lib/IM/MD5.pm b/img/lib/IM/MD5.pm
index b3f5c96e..3f0ba305 100644
--- a/img/lib/IM/MD5.pm
+++ b/img/lib/IM/MD5.pm
@@ -8,7 +8,7 @@
 ### Revised: Apr 23, 2007
 ###
 
-my $PM_VERSION = "IM::MD5.pm version 20100215(IM150)";
+my $PM_VERSION = "IM::MD5.pm version 20161010(IM153)";
 
 package IM::MD5;
 require 5.003;
@@ -339,7 +339,7 @@ sub MD5_Encode($$$) {
 # a multiple of 4.
 
 sub MD5_Decode($$$) {
-    my($output, $input, my $len) = @_;
+    my($output, $input, $len) = @_;
     my($i, $j);
 
     for ($i = 0, $j = 0; $j < $len; $i++, $j += 4) {
diff --git a/img/lib/IM/Message.pm b/img/lib/IM/Message.pm
index 7a5da888..2008282d 100644
--- a/img/lib/IM/Message.pm
+++ b/img/lib/IM/Message.pm
@@ -8,7 +8,7 @@
 ### Revised: Apr 23, 2007
 ###
 
-my $PM_VERSION = "IM::Message.pm version 20100215(IM150)";
+my $PM_VERSION = "IM::Message.pm version 20161010(IM153)";
 
 package IM::Message;
 require 5.003;
diff --git a/img/lib/IM/MsgStore.pm b/img/lib/IM/MsgStore.pm
index 9af02a80..88bd78e0 100644
--- a/img/lib/IM/MsgStore.pm
+++ b/img/lib/IM/MsgStore.pm
@@ -8,7 +8,7 @@
 ### Revised: Apr 23, 2007
 ###
 
-my $PM_VERSION = "IM::MsgStore.pm version 20100215(IM150)";
+my $PM_VERSION = "IM::MsgStore.pm version 20161010(IM153)";
 
 package IM::MsgStore;
 require 5.003;
diff --git a/img/lib/IM/Nntp.pm b/img/lib/IM/Nntp.pm
index fec2356b..8eee0fd5 100644
--- a/img/lib/IM/Nntp.pm
+++ b/img/lib/IM/Nntp.pm
@@ -8,7 +8,7 @@
 ### Revised: Apr 23, 2007
 ###
 
-my $PM_VERSION = "IM::Nntp.pm version 20100215(IM150)";
+my $PM_VERSION = "IM::Nntp.pm version 20161010(IM153)";
 
 package IM::Nntp;
 require 5.003;
diff --git a/img/lib/IM/Pop.pm b/img/lib/IM/Pop.pm
index db78385a..6495f96e 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: Apr 23, 2007
+### Revised: Feb 15, 2010
 ###
 
-my $PM_VERSION = "IM::Pop.pm version 20100215(IM150)";
+my $PM_VERSION = "IM::Pop.pm version 20161010(IM153)";
 
 package IM::Pop;
 require 5.003;
diff --git a/img/lib/IM/Recipient.pm b/img/lib/IM/Recipient.pm
index 6bcf235b..6839e8b2 100644
--- a/img/lib/IM/Recipient.pm
+++ b/img/lib/IM/Recipient.pm
@@ -8,7 +8,7 @@
 ### Revised: Apr 23, 2007
 ###
 
-my $PM_VERSION = "IM::Recipient.pm version 20100215(IM150)";
+my $PM_VERSION = "IM::Recipient.pm version 20161010(IM153)";
 
 package IM::Recipient;
 require 5.003;
diff --git a/img/lib/IM/Scan.pm b/img/lib/IM/Scan.pm
index c3891678..5bea594b 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: Apr 23, 2007
+### Revised: May 25, 2011
 ###
 
-my $PM_VERSION = "IM::Scan.pm version 20100215(IM150)";
+my $PM_VERSION = "IM::Scan.pm version 20161010(IM153)";
 
 package IM::Scan;
 require 5.003;
@@ -509,7 +509,7 @@ sub friendly_addr($$) {
     my($a, $f, $p);
     while (($a, $addr, $f) = &fetch_addr($addr, 1), $a ne '') {
 	$a =~ s/\/[^@]*//;
-	if (defined(%petnames) && $petnames{lc($a)}) {
+	if (%petnames && $petnames{lc($a)}) {
 	    $p = $petnames{lc($a)};
 	} elsif (!$need_addr && $f) {
 	    $p = &mime_decode_string($f);
diff --git a/img/lib/IM/Smtp.pm b/img/lib/IM/Smtp.pm
index 8fda7ca8..c8496bca 100644
--- a/img/lib/IM/Smtp.pm
+++ b/img/lib/IM/Smtp.pm
@@ -8,7 +8,7 @@
 ### Revised: Apr 23, 2007
 ###
 
-my $PM_VERSION = "IM::Smtp.pm version 20100215(IM150)";
+my $PM_VERSION = "IM::Smtp.pm version 20161010(IM153)";
 
 package IM::Smtp;
 require 5.003;
@@ -20,6 +20,9 @@ use IM::Log;
 use IM::Message qw(message_size put_header put_body put_mimed_bcc
 		   put_mimed_partial put_mimed_error_notify set_crlf);
 use IM::TcpTransaction;
+use IM::EncDec;
+use IM::GetPass;
+use IM::MD5;
 use integer;
 use strict;
 use vars qw(@ISA @EXPORT);
@@ -74,6 +77,8 @@ sub smtp_open($$$) {
 	foreach (@resp) {
 	    if (/^250[ \-]([A-Z0-9]+)$/) {
 		$ESMTP{$1} = 1;
+	    } elsif (/^250[ \-]([A-Z0-9]+) ([-A-Z0-9 ]+)$/) {
+		$ESMTP{$1} = $2;
 	    }
 	}
 	$Smtp_opened = 1;
@@ -175,6 +180,10 @@ sub smtp_transact_sub($$$$$$$) {
     } else {
         $btype = '';
     }
+    if ($server =~ m|/587$| && $ESMTP{'AUTH'}) { # Submission port ... use AUTH
+	$rc = &smtp_authentication();
+	return $rc if ($rc);
+    }
     if ($ESMTP{'SIZE'}) {
 	$msg_size = &message_size($Header, $Body, $part);
 	$rc = &tcp_command(\*SMTPd,
@@ -249,6 +258,31 @@ sub smtp_transact_sub($$$$$$$) {
     return 0;
 }
 
+sub smtp_authentication() {
+    my $rc = 0;
+    my $s = smtpaccount();
+    my($s, $auth, $user, $host) = split(m|[/:@]|, $s);
+    my($pass) = getpass('smtp', $auth, $host, $user);
+    if ($auth eq "PLAIN" && $ESMTP{'AUTH'} =~ /PLAIN/) {
+	$rc = &tcp_command(\*SMTPd, "AUTH PLAIN", '');
+	return $rc if ($rc);
+	my(@resp) = &command_response;
+      	if (@resp[0] !~ /^334/) {
+	    im_warn("AUTH PLAIN command failed.\n");
+	    return 1;
+	}
+	my $b = &b_encode_string("$user\@$host\0$user\@$host\0$pass");
+	$rc = &tcp_command(\*SMTPd, "$b", '********');
+	return $rc if ($rc);
+	my(@resp) = &command_response;
+	if (@resp[0] !~ /^235/) {
+	    im_warn("AUTH PLAIN authentication error.\n");
+	    return 1;
+	}
+    }
+    return $rc;
+}
+
 ##### SMTP TRANSACTION MANAGEMENT FOR RETURN ERROR NOTIFY #####
 #
 # smtp_transaction_for_error_notify(server, server_list, header, body)
diff --git a/img/lib/IM/Ssh.pm b/img/lib/IM/Ssh.pm
index f727b283..5142a737 100644
--- a/img/lib/IM/Ssh.pm
+++ b/img/lib/IM/Ssh.pm
@@ -9,7 +9,7 @@
 ### Revised: Apr 23, 2007
 ###
 
-my $PM_VERSION = "IM::Ssh.pm version 20100215(IM150)";
+my $PM_VERSION = "IM::Ssh.pm version 20161010(IM153)";
 
 package IM::Ssh;
 require 5.003;
diff --git a/img/lib/IM/Stdio.pm b/img/lib/IM/Stdio.pm
index a6034221..ac5e2ed6 100644
--- a/img/lib/IM/Stdio.pm
+++ b/img/lib/IM/Stdio.pm
@@ -8,7 +8,7 @@
 ### Revised: Apr 23, 2007
 ###
 
-my $PM_VERSION = "IM::Stdio.pm version 20100215(IM150)";
+my $PM_VERSION = "IM::Stdio.pm version 20161010(IM153)";
 
 package IM::Stdio;
 require 5.003;
diff --git a/img/lib/IM/TcpTransaction.pm b/img/lib/IM/TcpTransaction.pm
index e424810e..4df7699c 100644
--- a/img/lib/IM/TcpTransaction.pm
+++ b/img/lib/IM/TcpTransaction.pm
@@ -8,7 +8,7 @@
 ### Revised: Apr 23, 2007
 ###
 
-my $PM_VERSION = "IM::TcpTransaction.pm version 20100215(IM150)";
+my $PM_VERSION = "IM::TcpTransaction.pm version 20161010(IM153)";
 
 package IM::TcpTransaction;
 require 5.003;
diff --git a/img/lib/IM/Util.pm b/img/lib/IM/Util.pm
index 772bf457..96e4d06d 100644
--- a/img/lib/IM/Util.pm
+++ b/img/lib/IM/Util.pm
@@ -8,7 +8,7 @@
 ### Revised: Apr 23, 2007
 ###
 
-my $PM_VERSION = "IM::Util.pm version 20100215(IM150)";
+my $PM_VERSION = "IM::Util.pm version 20161010(IM153)";
 
 package IM::Util;
 require 5.003;