diff options
78 files changed, 336 insertions, 360 deletions
diff --git a/img/dist/IM/00changes b/img/dist/IM/00changes index f8ed5bda..3d6bd8d2 100644 --- a/img/dist/IM/00changes +++ b/img/dist/IM/00changes @@ -1,3 +1,9 @@ +146 (2003/10/28) + +* IM/TcpTransaction.pm, IM/Pop.pm, IM/Nntp.pm, IM/Imap.pm: Don't use $! as + an error indicator. +* IM/Nntp.pm (nntp_head_as_string): Don't use `next' outside a loop block. + 145 (2003/06/01) * IM/LocalMbox.pm (process_maildir): Fix for modern delivery identifiers in @@ -78,7 +84,7 @@ * IM/Config.pm.in, IM/EncDec.pm: Prevent a warning of `called too early to check prototype'. * IM/MsgStore.pm (new_message): Use message_number() instead of $MsgNum++. -* install-sh: Bug fix from GNU libtool 1.4.3. This file is under M.I.T. +* install-sh: Bug fix from GNU libtool 1.4.3. This file is under the X11 license. * imhsync.in, immknmz.in, IM/Ssh.pm: Clarify copyright notice. * imcat.in: `-S' option for SSHServer. diff --git a/img/dist/IM/00diff b/img/dist/IM/00diff index 7e42e7e3..f20fe730 100644 --- a/img/dist/IM/00diff +++ b/img/dist/IM/00diff @@ -1,3 +1,7 @@ + Differences between IM146 and IM145 + +* Fix that TCP transaction fails with Perl 5.8.1. + Differences between IM145 and IM144 * Fix that imget fails when modern delivery identifiers are used in a diff --git a/img/dist/IM/00readme b/img/dist/IM/00readme index 83be091d..23af8324 100644 --- a/img/dist/IM/00readme +++ b/img/dist/IM/00readme @@ -26,7 +26,7 @@ IM/MD5.pm is derived from md5.pl copyrighted by NAKAMURA, Motonori <motonori@econ.kyoto-u.ac.jp>. It is converted to Perl4 from C version derived from the RSA Data Security, Inc. MD5 Message-Digest Algorithm. -install-sh is under the M.I.T. license. +install-sh is under the X11 license. <<<Installing under the root privilege>>> diff --git a/img/dist/IM/IM/Address.pm b/img/dist/IM/IM/Address.pm index 3e62e691..06524365 100644 --- a/img/dist/IM/IM/Address.pm +++ b/img/dist/IM/IM/Address.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::Address.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::Address.pm version 20031028(IM146)"; package IM::Address; require 5.003; diff --git a/img/dist/IM/IM/Alias.pm b/img/dist/IM/IM/Alias.pm index e5a10a03..f8725e20 100644 --- a/img/dist/IM/IM/Alias.pm +++ b/img/dist/IM/IM/Alias.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::Alias.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::Alias.pm version 20031028(IM146)"; package IM::Alias; require 5.003; diff --git a/img/dist/IM/IM/Config.pm.in b/img/dist/IM/IM/Config.pm.in index 85753676..4e2f8507 100644 --- a/img/dist/IM/IM/Config.pm.in +++ b/img/dist/IM/IM/Config.pm.in @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::Config.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::Config.pm version 20031028(IM146)"; package IM::Config; require 5.003; diff --git a/img/dist/IM/IM/EncDec.pm b/img/dist/IM/IM/EncDec.pm index eb39ae46..c01433a0 100644 --- a/img/dist/IM/IM/EncDec.pm +++ b/img/dist/IM/IM/EncDec.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::EncDec.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::EncDec.pm version 20031028(IM146)"; package IM::EncDec; require 5.003; diff --git a/img/dist/IM/IM/File.pm b/img/dist/IM/IM/File.pm index 3f94b509..384c4434 100644 --- a/img/dist/IM/IM/File.pm +++ b/img/dist/IM/IM/File.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Jul 7, 1997 -### Revised: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::File.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::File.pm version 20031028(IM146)"; package IM::File; require 5.003; diff --git a/img/dist/IM/IM/Folder.pm b/img/dist/IM/IM/Folder.pm index 1f85d6d0..9f3a746f 100644 --- a/img/dist/IM/IM/Folder.pm +++ b/img/dist/IM/IM/Folder.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::Folder.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::Folder.pm version 20031028(IM146)"; package IM::Folder; require 5.003; diff --git a/img/dist/IM/IM/GetPass.pm b/img/dist/IM/IM/GetPass.pm index b1723959..662577ec 100644 --- a/img/dist/IM/IM/GetPass.pm +++ b/img/dist/IM/IM/GetPass.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 30, 1997 -### Revised: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::GetPass.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::GetPass.pm version 20031028(IM146)"; package IM::GetPass; require 5.003; diff --git a/img/dist/IM/IM/Grep.pm b/img/dist/IM/IM/Grep.pm index c3ca599f..72da001f 100644 --- a/img/dist/IM/IM/Grep.pm +++ b/img/dist/IM/IM/Grep.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Nov 03, 1997 -### Revised: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::Grep.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::Grep.pm version 20031028(IM146)"; package IM::Grep; require 5.003; diff --git a/img/dist/IM/IM/History.pm b/img/dist/IM/IM/History.pm index d4a074b8..13eb2b27 100644 --- a/img/dist/IM/IM/History.pm +++ b/img/dist/IM/IM/History.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Jul 6, 1997 -### Revised: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::History.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::History.pm version 20031028(IM146)"; package IM::History; require 5.003; diff --git a/img/dist/IM/IM/Http.pm b/img/dist/IM/IM/Http.pm index 0c21d881..4686bf55 100644 --- a/img/dist/IM/IM/Http.pm +++ b/img/dist/IM/IM/Http.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::Http.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::Http.pm version 20031028(IM146)"; package IM::Http; require 5.003; diff --git a/img/dist/IM/IM/Imap.pm b/img/dist/IM/IM/Imap.pm index 5ccf4810..941c1583 100644 --- a/img/dist/IM/IM/Imap.pm +++ b/img/dist/IM/IM/Imap.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::Imap.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::Imap.pm version 20031028(IM146)"; package IM::Imap; require 5.003; @@ -195,15 +195,8 @@ sub imap_get($$) { if ($resp =~ /^\* \d+ FETCH \((UID $num )?RFC822 \{(\d+)\}/i) { my $size = $2; alarm(imap_timeout()) unless win95p(); - $! = 0; while (<$HANDLE>) { - unless (win95p()) { - alarm(0); - if ($!) { # may be channel truoble - im_warn("lost connection for FETCH(get).\n"); - return (-1, 0); - } - } + alarm(0) unless win95p(); $size -= length($_); s/\r\n$/\n/; im_debug($_) if (&debug('imap')); @@ -211,6 +204,11 @@ sub imap_get($$) { last if ($size <= 0); } alarm(0) unless win95p(); + if ($size > 0) { + # may be channel trouble + im_warn("lost connection for FETCH(get).\n"); + return (-1, 0); + } $resp = &next_response($HANDLE); return (-1, 0) if ($resp !~ /^\)/ && $resp !~ /^( FLAGS \(.*\)| UID $num)+\)/); @@ -240,15 +238,8 @@ sub imap_head($$) { my($size, $len) = ($2, $3); my $field = ''; alarm(imap_timeout()) unless win95p(); - $! = 0; while (<$HANDLE>) { - unless (win95p()) { - alarm(0); - if ($!) { # may be channel truoble - im_warn("lost connection for FETCH(head).\n"); - return (-1, 0); - } - } + alarm(0) unless win95p(); $len -= length($_); s/\r?\n$//; im_debug("$_\n") if (&debug('imap')); @@ -269,6 +260,11 @@ sub imap_head($$) { last if ($len <= 0); } alarm(0) unless win95p(); + if ($len > 0) { + # may be channel trouble + im_warn("lost connection for FETCH(head).\n"); + return (-1, 0); + } # $head{'bytes:'} = $size; $head{'kbytes:'} = int(($size + 1023) / 1024); $resp = &next_response($HANDLE); @@ -299,15 +295,8 @@ sub imap_from($$) { my $found = 0; my $f; alarm(imap_timeout()) unless win95p(); - $! = 0; while (<$HANDLE>) { - unless (win95p()) { - alarm(0); - if ($!) { # may be channel truoble - im_warn("lost connection for FETCH(from).\n"); - return -1; - } - } + alarm(0) unless win95p(); $size -= length($_); s/\r\n$/\n/; im_debug($_) if (&debug('imap')); @@ -322,6 +311,11 @@ sub imap_from($$) { last if ($size <= 0); } alarm(0) unless win95p(); + if ($size > 0) { + # may be channel trouble + im_warn("lost connection for FETCH(from).\n"); + return -1; + } $f =~ s/\n[ \t]*/ /g; $f = '(sender unknown)' unless ($f); print "From $f\n"; @@ -793,15 +787,8 @@ sub imap_scan_folder($$@) { ($uid, $size, $len) = ($2, $3, $4); my @hdr; alarm(imap_timeout()) unless win95p(); - $! = 0; while (<$HANDLE>) { - unless (win95p()) { - alarm(0); - if ($!) { # may be channel truoble - im_warn("lost connection for FETCH(scan).\n"); - return -1; - } - } + alarm(0) unless win95p(); $len -= length; s/\r?\n$/\n/; im_warn($_) if (&debug('imap')); @@ -809,6 +796,11 @@ sub imap_scan_folder($$@) { last if ($len <= 0); } alarm(0) unless win95p(); + if ($len > 0) { + # may be channel trouble + im_warn("lost connection for FETCH(scan).\n"); + return -1; + } $resp = &next_response($HANDLE); if (!$uid) { return -1 if ($resp !~ /^ UID (\d+)\)/); diff --git a/img/dist/IM/IM/Iso2022jp.pm b/img/dist/IM/IM/Iso2022jp.pm index 792ab822..e6992a5e 100644 --- a/img/dist/IM/IM/Iso2022jp.pm +++ b/img/dist/IM/IM/Iso2022jp.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::Iso2022jp.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::Iso2022jp.pm version 20031028(IM146)"; package IM::Iso2022jp; require 5.003; diff --git a/img/dist/IM/IM/Japanese.pm b/img/dist/IM/IM/Japanese.pm index bc39bf78..84055d5f 100644 --- a/img/dist/IM/IM/Japanese.pm +++ b/img/dist/IM/IM/Japanese.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::Japanese.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::Japanese.pm version 20031028(IM146)"; package IM::Japanese; require 5.003; diff --git a/img/dist/IM/IM/LocalMbox.pm b/img/dist/IM/IM/LocalMbox.pm index 4f98fd76..70b80e13 100644 --- a/img/dist/IM/IM/LocalMbox.pm +++ b/img/dist/IM/IM/LocalMbox.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::LocalMbox.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::LocalMbox.pm version 20031028(IM146)"; package IM::LocalMbox; require 5.003; diff --git a/img/dist/IM/IM/Log.pm b/img/dist/IM/IM/Log.pm index 0a124c3f..b45f4d21 100644 --- a/img/dist/IM/IM/Log.pm +++ b/img/dist/IM/IM/Log.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::Log.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::Log.pm version 20031028(IM146)"; package IM::Log; require 5.003; diff --git a/img/dist/IM/IM/MD5.pm b/img/dist/IM/IM/MD5.pm index 34e2473e..d7d3d8cc 100644 --- a/img/dist/IM/IM/MD5.pm +++ b/img/dist/IM/IM/MD5.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::MD5.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::MD5.pm version 20031028(IM146)"; package IM::MD5; require 5.003; diff --git a/img/dist/IM/IM/Message.pm b/img/dist/IM/IM/Message.pm index f7847eff..cbfbf544 100644 --- a/img/dist/IM/IM/Message.pm +++ b/img/dist/IM/IM/Message.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::Message.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::Message.pm version 20031028(IM146)"; package IM::Message; require 5.003; diff --git a/img/dist/IM/IM/MsgStore.pm b/img/dist/IM/IM/MsgStore.pm index 614d7982..939ffbea 100644 --- a/img/dist/IM/IM/MsgStore.pm +++ b/img/dist/IM/IM/MsgStore.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::MsgStore.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::MsgStore.pm version 20031028(IM146)"; package IM::MsgStore; require 5.003; diff --git a/img/dist/IM/IM/Nntp.pm b/img/dist/IM/IM/Nntp.pm index 3778e12f..87bfea19 100644 --- a/img/dist/IM/IM/Nntp.pm +++ b/img/dist/IM/IM/Nntp.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::Nntp.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::Nntp.pm version 20031028(IM146)"; package IM::Nntp; require 5.003; @@ -170,23 +170,15 @@ sub nntp_head_as_string($) { im_notice("getting article $i.\n"); $rc = &tcp_command(\*NNTPd, "HEAD $i", ''); - next if ($rc > 0); - if ($rc < 0) { + if ($rc != 0) { im_warn("HEAD command failed.\n"); return -1; } $count++; my($found, $f) = (0, ''); alarm(nntp_timeout()) unless win95p(); - $! = 0; while (<NNTPd>) { - unless (win95p()) { - alarm(0); - if ($!) { # may be channel truoble - im_warn("lost connection for HEAD.\n"); - return -1; - } - } + alarm(0) unless win95p(); s/\r\n$/\n/; last if ($_ =~ /^\.\n$/); s/^\.//; @@ -194,6 +186,11 @@ sub nntp_head_as_string($) { $f .= $_; } alarm(0) unless win95p(); + if (!defined($_)) { + # may be channel trouble + im_warn("lost connection for HEAD.\n"); + return -1; + } return $f; } @@ -214,15 +211,8 @@ sub nntp_head($$) { $count++; my($found, $f) = (0, ''); alarm(nntp_timeout()) unless win95p(); - $! = 0; while (<NNTPd>) { - unless (win95p()) { - alarm(0); - if ($!) { # may be channel truoble - im_warn("lost connection for HEAD.\n"); - return -1; - } - } + alarm(0) unless win95p(); s/\r\n$/\n/; last if ($_ =~ /^\.\n$/); s/^\.//; @@ -236,6 +226,12 @@ sub nntp_head($$) { $found = 0; } } + alarm(0) unless win95p(); + if (!defined($_)) { + # may be channel trouble + im_warn("lost connection for HEAD.\n"); + return -1; + } $f =~ s/\n[ \t]*/ /g; $f = '(sender unknown)' unless ($f); print "From $f\n"; @@ -285,15 +281,8 @@ sub nntp_article($) { } my @Article = (); alarm(nntp_timeout()) unless win95p(); - $! = 0; while (<NNTPd>) { - unless (win95p()) { - alarm(0); - if ($!) { # may be channel truoble - im_warn("lost connection for ARTICLE.\n"); - return(-1, ''); - } - } + alarm(0) unless win95p(); s/\r\n$/\n/; last if ($_ =~ /^\.\n$/); s/^\.//; @@ -301,6 +290,11 @@ sub nntp_article($) { im_debug($_) if (&debug('nntp')); } alarm(0) unless win95p(); + if (!defined($_)) { + # may be channel trouble + im_warn("lost connection for ARTICLE.\n"); + return(-1, ''); + } return(0, \@Article); } diff --git a/img/dist/IM/IM/Pop.pm b/img/dist/IM/IM/Pop.pm index 50b8e300..0892a2ab 100644 --- a/img/dist/IM/IM/Pop.pm +++ b/img/dist/IM/IM/Pop.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::Pop.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::Pop.pm version 20031028(IM146)"; package IM::Pop; require 5.003; @@ -148,15 +148,8 @@ sub pop_retr($$$) { return -1; } alarm(pop_timeout()) unless win95p(); - $! = 0; while (<POPd>) { - unless (win95p()) { - alarm(0); - if ($!) { # may be channel truoble - im_warn("lost connection for RETR.\n"); - return -1; - } - } + alarm(0) unless win95p(); s/\r\n$/\n/; last if ($_ =~ /^\.\n$/); s/^\.//; @@ -164,6 +157,11 @@ sub pop_retr($$$) { push (@Message, $_); } alarm(0) unless win95p(); + if (!defined($_)) { + # may be channel trouble + im_warn("lost connection for RETR.\n"); + return -1; + } return -1 if (store_message(\@Message, $dst, $noscan) < 0); &exec_getsbrfile($dst); @@ -184,15 +182,8 @@ sub pop_head($) { my(%head); undef %head; alarm(pop_timeout()) unless win95p(); - $! = 0; while (<POPd>) { - unless (win95p()) { - alarm(0); - if ($!) { # may be channel truoble - im_warn("lost connection for HEAD.\n"); - return 0; - } - } + alarm(0) unless win95p(); s/\r?\n$//; last if ($_ =~ /^\.$/); s/^\.//; @@ -214,6 +205,11 @@ sub pop_head($) { } } alarm(0) unless win95p(); + if (!defined($_)) { + # may be channel trouble + im_warn("lost connection for HEAD.\n"); + return 0; + } return \%head; } @@ -238,15 +234,8 @@ sub pop_uidl($) { return -1; } alarm(pop_timeout()) unless win95p(); - $! = 0; while (<POPd>) { - unless (win95p()) { - alarm(0); - if ($!) { # may be channel truoble - im_warn("lost connection for UIDL.\n"); - return -1; - } - } + alarm(0) unless win95p(); s/\r\n$/\n/; last if ($_ =~ /^\.\n$/); im_debug($_) if (&debug('pop')); @@ -255,6 +244,11 @@ sub pop_uidl($) { } } alarm(0) unless win95p(); + if (!defined($_)) { + # may be channel trouble + im_warn("lost connection for UIDL.\n"); + return -1; + } return 0; } diff --git a/img/dist/IM/IM/Recipient.pm b/img/dist/IM/IM/Recipient.pm index 917cd9a1..583d7016 100644 --- a/img/dist/IM/IM/Recipient.pm +++ b/img/dist/IM/IM/Recipient.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 27, 1997 -### Revised: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::Recipient.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::Recipient.pm version 20031028(IM146)"; package IM::Recipient; require 5.003; diff --git a/img/dist/IM/IM/Scan.pm b/img/dist/IM/IM/Scan.pm index 0a465a9f..deb2dbd9 100644 --- a/img/dist/IM/IM/Scan.pm +++ b/img/dist/IM/IM/Scan.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::Scan.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::Scan.pm version 20031028(IM146)"; package IM::Scan; require 5.003; diff --git a/img/dist/IM/IM/Smtp.pm b/img/dist/IM/IM/Smtp.pm index 5b9421ca..2839b5c1 100644 --- a/img/dist/IM/IM/Smtp.pm +++ b/img/dist/IM/IM/Smtp.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::Smtp.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::Smtp.pm version 20031028(IM146)"; package IM::Smtp; require 5.003; diff --git a/img/dist/IM/IM/Ssh.pm b/img/dist/IM/IM/Ssh.pm index b997992d..cc411d11 100644 --- a/img/dist/IM/IM/Ssh.pm +++ b/img/dist/IM/IM/Ssh.pm @@ -6,10 +6,10 @@ ### Author: Masatoshi Tsuchiya <tsuchiya@pine.kuee.kyoto-u.ac.jp> ### Internet Message Group <img@mew.org> ### Created: Oct 05, 1999 -### Revised: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::Ssh.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::Ssh.pm version 20031028(IM146)"; package IM::Ssh; require 5.003; diff --git a/img/dist/IM/IM/Stdio.pm b/img/dist/IM/IM/Stdio.pm index bae416ea..6b7be57f 100644 --- a/img/dist/IM/IM/Stdio.pm +++ b/img/dist/IM/IM/Stdio.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: May 7, 1997 -### Revised: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::Stdio.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::Stdio.pm version 20031028(IM146)"; package IM::Stdio; require 5.003; diff --git a/img/dist/IM/IM/TcpTransaction.pm b/img/dist/IM/IM/TcpTransaction.pm index 051cfc73..0579ac29 100644 --- a/img/dist/IM/IM/TcpTransaction.pm +++ b/img/dist/IM/IM/TcpTransaction.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::TcpTransaction.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::TcpTransaction.pm version 20031028(IM146)"; package IM::TcpTransaction; require 5.003; @@ -207,7 +207,7 @@ sub tcp_command($$$) { im_notice("<<< $logcmd\n"); $Session_log .= "<<< $logcmd\n" if ($Logging); unless (print $CHAN "$command\r\n") { - # may be channel truoble + # may be channel trouble @Response = ($!); return 1; } @@ -220,14 +220,15 @@ sub tcp_command($$$) { } do { alarm(command_timeout()) unless win95p(); - $! = 0; $resp = <$CHAN>; - unless (win95p()) { - alarm(0); - if ($!) { # may be channel truoble - @Response = ("$!"); - return 1; - } + if (!defined($resp)) { + # may be channel trouble + @Response = ("$!"); + } + alarm(0) unless win95p(); + if (!defined($resp)) { + # may be channel trouble + return 1; } $resp =~ s/[\r\n]+$//; if ($resp =~ /^([0-9][0-9][0-9])/) { @@ -268,14 +269,15 @@ sub send_command($$$) { $0 = progname() . ": greeting ($Cur_server)"; } alarm(command_timeout()) unless win95p(); - $! = 0; $resp = <$CHAN>; - unless (win95p()) { - alarm(0); - if ($!) { # may be channel truoble - im_notice("$!\n"); - return ''; - } + if (!defined($resp)) { + # may be channel trouble + im_notice("$!\n"); + } + alarm(0) unless win95p(); + if (!defined($resp)) { + # may be channel trouble + return ''; } $resp =~ s/[\r\n]+/\n/; im_notice(">>> $resp"); @@ -303,14 +305,15 @@ sub next_response($) { my $resp; alarm(command_timeout()) unless win95p(); - $! = 0; $resp = <$CHAN>; - unless (win95p()) { - alarm(0); - if ($!) { # may be channel truoble - im_notice("$!\n"); - return ''; - } + if (!defined($resp)) { + # may be channel trouble + im_notice("$!\n"); + } + alarm(0) unless win95p(); + if (!defined($resp)) { + # may be channel trouble + return ''; } $resp =~ s/[\r\n]+/\n/; im_notice(">>> $resp"); diff --git a/img/dist/IM/IM/Util.pm b/img/dist/IM/IM/Util.pm index 1591eacd..516a88a2 100644 --- a/img/dist/IM/IM/Util.pm +++ b/img/dist/IM/IM/Util.pm @@ -5,10 +5,10 @@ ### ### Author: Internet Message Group <img@mew.org> ### Created: Apr 23, 1997 -### Revised: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::Util.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::Util.pm version 20031028(IM146)"; package IM::Util; require 5.003; diff --git a/img/dist/IM/imali.in b/img/dist/IM/imali.in index 16a27edf..a439906f 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: Jun 1, 2003 +### Revised: Oct 28, 2003 ### BEGIN { @@ -13,7 +13,7 @@ BEGIN { @im_src_siteperl@ }; -my $VERSION = "imali version 20030601(IM145)"; +my $VERSION = "imali version 20031028(IM146)"; $Prog = 'imali'; diff --git a/img/dist/IM/imcat.in b/img/dist/IM/imcat.in index 02df650d..65aba355 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: Jun 1, 2003 +### Revised: Oct 28, 2003 ### BEGIN { @@ -13,7 +13,7 @@ BEGIN { @im_src_siteperl@ }; -my $VERSION = "imcat version 20030601(IM145)"; +my $VERSION = "imcat version 20031028(IM146)"; $Prog = 'imcat'; diff --git a/img/dist/IM/imcd.in b/img/dist/IM/imcd.in index 104a2ad8..2e443db8 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: Jun 1, 2003 +### Revised: Oct 28, 2003 ### BEGIN { @@ -13,7 +13,7 @@ BEGIN { @im_src_siteperl@ }; -my $VERSION = "imcd version 20030601(IM145)"; +my $VERSION = "imcd version 20031028(IM146)"; $Prog = 'imcd'; diff --git a/img/dist/IM/imclean.in b/img/dist/IM/imclean.in index 874b03bb..b0b4b34b 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: Jun 1, 2003 +### Revised: Oct 28, 2003 ### BEGIN { @@ -13,7 +13,7 @@ BEGIN { @im_src_siteperl@ }; -my $VERSION = "imclean version 20030601(IM145)"; +my $VERSION = "imclean version 20031028(IM146)"; $Prog = 'imclean'; diff --git a/img/dist/IM/imget.in b/img/dist/IM/imget.in index e8159c76..eb5705c0 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: Jun 1, 2003 +### Revised: Oct 28, 2003 ### BEGIN { @@ -13,7 +13,7 @@ BEGIN { @im_src_siteperl@ }; -my $VERSION = "imget version 20030601(IM145)"; +my $VERSION = "imget version 20031028(IM146)"; $Prog = 'imget'; diff --git a/img/dist/IM/imgrep.in b/img/dist/IM/imgrep.in index 2b0dc42d..609c7849 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: Jun 1, 2003 +### Revised: Oct 28, 2003 ### BEGIN { @@ -13,7 +13,7 @@ BEGIN { @im_src_siteperl@ }; -my $VERSION = "imgrep version 20030601(IM145)"; +my $VERSION = "imgrep version 20031028(IM146)"; $Prog = 'imgrep'; diff --git a/img/dist/IM/imhist.in b/img/dist/IM/imhist.in index d31fb5be..a864f64d 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: Jun 1, 2003 +### Revised: Oct 28, 2003 ### BEGIN { @@ -13,7 +13,7 @@ BEGIN { @im_src_siteperl@ }; -my $VERSION = "imhist version 20030601(IM145)"; +my $VERSION = "imhist version 20031028(IM146)"; $Prog = 'imhist'; diff --git a/img/dist/IM/imhsync.in b/img/dist/IM/imhsync.in index 655974ab..9c0fac91 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: Jun 1, 2003 +### Revised: Oct 28, 2003 ### BEGIN { @@ -13,7 +13,7 @@ BEGIN { @im_src_siteperl@ }; -my $VERSION = "imhsync version 20030601(IM145)"; +my $VERSION = "imhsync version 20031028(IM146)"; $Prog = 'imhsync'; diff --git a/img/dist/IM/imjoin.in b/img/dist/IM/imjoin.in index f28463fb..5ca9fe41 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: Jun 1, 2003 +### Revised: Oct 28, 2003 ### BEGIN { @@ -13,7 +13,7 @@ BEGIN { @im_src_siteperl@ }; -my $VERSION = "imjoin version 20030601(IM145)"; +my $VERSION = "imjoin version 20031028(IM146)"; $Prog = 'imjoin'; diff --git a/img/dist/IM/imls.in b/img/dist/IM/imls.in index de081efe..111b9f1b 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: Jun 1, 2003 +### Revised: Oct 28, 2003 ### BEGIN { @@ -13,7 +13,7 @@ BEGIN { @im_src_siteperl@ }; -my $VERSION = "imls version 20030601(IM145)"; +my $VERSION = "imls version 20031028(IM146)"; $Prog = 'imls'; diff --git a/img/dist/IM/immknmz.in b/img/dist/IM/immknmz.in index 21fa9bfd..86509100 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: Jun 1, 2003 +### Revised: Oct 28, 2003 ### BEGIN { @@ -14,7 +14,7 @@ BEGIN { @im_src_siteperl@ }; -my $VERSION = "immknmz version 20030601(IM145)"; +my $VERSION = "immknmz version 20031028(IM146)"; $Prog = 'immknmz'; diff --git a/img/dist/IM/immv.in b/img/dist/IM/immv.in index 710bd2d1..e610418b 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: Jun 1, 2003 +### Revised: Oct 28, 2003 ### BEGIN { @@ -13,7 +13,7 @@ BEGIN { @im_src_siteperl@ }; -my $VERSION = "immv version 20030601(IM145)"; +my $VERSION = "immv version 20031028(IM146)"; $Prog = 'immv'; diff --git a/img/dist/IM/impack.in b/img/dist/IM/impack.in index 116ee61a..b4ad86d6 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: Jun 1, 2003 +### Revised: Oct 28, 2003 ### BEGIN { @@ -13,7 +13,7 @@ BEGIN { @im_src_siteperl@ }; -my $VERSION = "impack version 20030601(IM145)"; +my $VERSION = "impack version 20031028(IM146)"; $Prog = 'impack'; diff --git a/img/dist/IM/impath.in b/img/dist/IM/impath.in index bb616af9..b0aef32b 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: Jun 1, 2003 +### Revised: Oct 28, 2003 ### BEGIN { @@ -13,7 +13,7 @@ BEGIN { @im_src_siteperl@ }; -my $VERSION = "impath version 20030601(IM145)"; +my $VERSION = "impath version 20031028(IM146)"; $Prog = 'impath'; diff --git a/img/dist/IM/imput.in b/img/dist/IM/imput.in index b1368329..0202409a 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: Jun 1, 2003 +### Revised: Oct 28, 2003 ### BEGIN { @@ -13,7 +13,7 @@ BEGIN { @im_src_siteperl@ }; -$VERSION = "imput version 20030601(IM145)"; +$VERSION = "imput version 20031028(IM146)"; $Prog = 'imput'; diff --git a/img/dist/IM/impwagent.in b/img/dist/IM/impwagent.in index 782514b3..34f53d69 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: Jun 1, 2003 +### Revised: Oct 28, 2003 ### BEGIN { @@ -13,7 +13,7 @@ BEGIN { @im_src_siteperl@ }; -my $VERSION = "impwagent version 20030601(IM145)"; +my $VERSION = "impwagent version 20031028(IM146)"; $Prog = 'impwagent'; diff --git a/img/dist/IM/imrm.in b/img/dist/IM/imrm.in index be302a41..7210d046 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: Jun 1, 2003 +### Revised: Oct 28, 2003 ### BEGIN { @@ -13,7 +13,7 @@ BEGIN { @im_src_siteperl@ }; -my $VERSION = "imrm version 20030601(IM145)"; +my $VERSION = "imrm version 20031028(IM146)"; $Prog = 'imrm'; diff --git a/img/dist/IM/imsetup.in b/img/dist/IM/imsetup.in index 5ec40645..cd2c905f 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: Jun 1, 2003 +### Revised: Oct 28, 2003 ### BEGIN { @@ -13,7 +13,7 @@ BEGIN { @im_src_siteperl@ }; -my $VERSION = "imsetup version 20030601(IM145)"; +my $VERSION = "imsetup version 20031028(IM146)"; $Prog = 'imsetup'; diff --git a/img/dist/IM/imsort.in b/img/dist/IM/imsort.in index 70d34aad..a99836e0 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: Jun 1, 2003 +### Revised: Oct 28, 2003 ### BEGIN { @@ -13,7 +13,7 @@ BEGIN { @im_src_siteperl@ }; -my $VERSION = "imsort version 20030601(IM145)"; +my $VERSION = "imsort version 20031028(IM146)"; $Prog = 'imsort'; diff --git a/img/dist/IM/imstore.in b/img/dist/IM/imstore.in index 98c00409..051d92b7 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: Jun 1, 2003 +### Revised: Oct 28, 2003 ### BEGIN { @@ -13,7 +13,7 @@ BEGIN { @im_src_siteperl@ }; -my $VERSION = "imstore version 20030601(IM145)"; +my $VERSION = "imstore version 20031028(IM146)"; $Prog = 'imstore'; diff --git a/img/dist/IM/imtar.in b/img/dist/IM/imtar.in index ebb7a04d..1555fc15 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: Jun 1, 2003 +### Revised: Oct 28, 2003 ### BEGIN { @@ -13,7 +13,7 @@ BEGIN { @im_src_siteperl@ }; -my $VERSION = "imtar version 20030601(IM145)"; +my $VERSION = "imtar version 20031028(IM146)"; $Prog = 'imtar'; diff --git a/img/lib/IM/Address.pm b/img/lib/IM/Address.pm index 3e62e691..06524365 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: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::Address.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::Address.pm version 20031028(IM146)"; package IM::Address; require 5.003; diff --git a/img/lib/IM/Alias.pm b/img/lib/IM/Alias.pm index e5a10a03..f8725e20 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: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::Alias.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::Alias.pm version 20031028(IM146)"; package IM::Alias; require 5.003; diff --git a/img/lib/IM/Config.pm.in b/img/lib/IM/Config.pm.in index 85753676..4e2f8507 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: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::Config.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::Config.pm version 20031028(IM146)"; package IM::Config; require 5.003; diff --git a/img/lib/IM/EncDec.pm b/img/lib/IM/EncDec.pm index eb39ae46..c01433a0 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: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::EncDec.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::EncDec.pm version 20031028(IM146)"; package IM::EncDec; require 5.003; diff --git a/img/lib/IM/File.pm b/img/lib/IM/File.pm index 3f94b509..384c4434 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: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::File.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::File.pm version 20031028(IM146)"; package IM::File; require 5.003; diff --git a/img/lib/IM/Folder.pm b/img/lib/IM/Folder.pm index 1f85d6d0..9f3a746f 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: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::Folder.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::Folder.pm version 20031028(IM146)"; package IM::Folder; require 5.003; diff --git a/img/lib/IM/GetPass.pm b/img/lib/IM/GetPass.pm index b1723959..662577ec 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: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::GetPass.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::GetPass.pm version 20031028(IM146)"; package IM::GetPass; require 5.003; diff --git a/img/lib/IM/Grep.pm b/img/lib/IM/Grep.pm index c3ca599f..72da001f 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: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::Grep.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::Grep.pm version 20031028(IM146)"; package IM::Grep; require 5.003; diff --git a/img/lib/IM/History.pm b/img/lib/IM/History.pm index d4a074b8..13eb2b27 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: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::History.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::History.pm version 20031028(IM146)"; package IM::History; require 5.003; diff --git a/img/lib/IM/Http.pm b/img/lib/IM/Http.pm index 0c21d881..4686bf55 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: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::Http.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::Http.pm version 20031028(IM146)"; package IM::Http; require 5.003; diff --git a/img/lib/IM/Imap.pm b/img/lib/IM/Imap.pm index 5ccf4810..941c1583 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: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::Imap.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::Imap.pm version 20031028(IM146)"; package IM::Imap; require 5.003; @@ -195,15 +195,8 @@ sub imap_get($$) { if ($resp =~ /^\* \d+ FETCH \((UID $num )?RFC822 \{(\d+)\}/i) { my $size = $2; alarm(imap_timeout()) unless win95p(); - $! = 0; while (<$HANDLE>) { - unless (win95p()) { - alarm(0); - if ($!) { # may be channel truoble - im_warn("lost connection for FETCH(get).\n"); - return (-1, 0); - } - } + alarm(0) unless win95p(); $size -= length($_); s/\r\n$/\n/; im_debug($_) if (&debug('imap')); @@ -211,6 +204,11 @@ sub imap_get($$) { last if ($size <= 0); } alarm(0) unless win95p(); + if ($size > 0) { + # may be channel trouble + im_warn("lost connection for FETCH(get).\n"); + return (-1, 0); + } $resp = &next_response($HANDLE); return (-1, 0) if ($resp !~ /^\)/ && $resp !~ /^( FLAGS \(.*\)| UID $num)+\)/); @@ -240,15 +238,8 @@ sub imap_head($$) { my($size, $len) = ($2, $3); my $field = ''; alarm(imap_timeout()) unless win95p(); - $! = 0; while (<$HANDLE>) { - unless (win95p()) { - alarm(0); - if ($!) { # may be channel truoble - im_warn("lost connection for FETCH(head).\n"); - return (-1, 0); - } - } + alarm(0) unless win95p(); $len -= length($_); s/\r?\n$//; im_debug("$_\n") if (&debug('imap')); @@ -269,6 +260,11 @@ sub imap_head($$) { last if ($len <= 0); } alarm(0) unless win95p(); + if ($len > 0) { + # may be channel trouble + im_warn("lost connection for FETCH(head).\n"); + return (-1, 0); + } # $head{'bytes:'} = $size; $head{'kbytes:'} = int(($size + 1023) / 1024); $resp = &next_response($HANDLE); @@ -299,15 +295,8 @@ sub imap_from($$) { my $found = 0; my $f; alarm(imap_timeout()) unless win95p(); - $! = 0; while (<$HANDLE>) { - unless (win95p()) { - alarm(0); - if ($!) { # may be channel truoble - im_warn("lost connection for FETCH(from).\n"); - return -1; - } - } + alarm(0) unless win95p(); $size -= length($_); s/\r\n$/\n/; im_debug($_) if (&debug('imap')); @@ -322,6 +311,11 @@ sub imap_from($$) { last if ($size <= 0); } alarm(0) unless win95p(); + if ($size > 0) { + # may be channel trouble + im_warn("lost connection for FETCH(from).\n"); + return -1; + } $f =~ s/\n[ \t]*/ /g; $f = '(sender unknown)' unless ($f); print "From $f\n"; @@ -793,15 +787,8 @@ sub imap_scan_folder($$@) { ($uid, $size, $len) = ($2, $3, $4); my @hdr; alarm(imap_timeout()) unless win95p(); - $! = 0; while (<$HANDLE>) { - unless (win95p()) { - alarm(0); - if ($!) { # may be channel truoble - im_warn("lost connection for FETCH(scan).\n"); - return -1; - } - } + alarm(0) unless win95p(); $len -= length; s/\r?\n$/\n/; im_warn($_) if (&debug('imap')); @@ -809,6 +796,11 @@ sub imap_scan_folder($$@) { last if ($len <= 0); } alarm(0) unless win95p(); + if ($len > 0) { + # may be channel trouble + im_warn("lost connection for FETCH(scan).\n"); + return -1; + } $resp = &next_response($HANDLE); if (!$uid) { return -1 if ($resp !~ /^ UID (\d+)\)/); diff --git a/img/lib/IM/Iso2022jp.pm b/img/lib/IM/Iso2022jp.pm index 792ab822..e6992a5e 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: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::Iso2022jp.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::Iso2022jp.pm version 20031028(IM146)"; package IM::Iso2022jp; require 5.003; diff --git a/img/lib/IM/Japanese.pm b/img/lib/IM/Japanese.pm index bc39bf78..84055d5f 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: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::Japanese.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::Japanese.pm version 20031028(IM146)"; package IM::Japanese; require 5.003; diff --git a/img/lib/IM/LocalMbox.pm b/img/lib/IM/LocalMbox.pm index 4f98fd76..70b80e13 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: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::LocalMbox.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::LocalMbox.pm version 20031028(IM146)"; package IM::LocalMbox; require 5.003; diff --git a/img/lib/IM/Log.pm b/img/lib/IM/Log.pm index 0a124c3f..b45f4d21 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: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::Log.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::Log.pm version 20031028(IM146)"; package IM::Log; require 5.003; diff --git a/img/lib/IM/MD5.pm b/img/lib/IM/MD5.pm index 34e2473e..d7d3d8cc 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: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::MD5.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::MD5.pm version 20031028(IM146)"; package IM::MD5; require 5.003; diff --git a/img/lib/IM/Message.pm b/img/lib/IM/Message.pm index f7847eff..cbfbf544 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: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::Message.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::Message.pm version 20031028(IM146)"; package IM::Message; require 5.003; diff --git a/img/lib/IM/MsgStore.pm b/img/lib/IM/MsgStore.pm index 614d7982..939ffbea 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: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::MsgStore.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::MsgStore.pm version 20031028(IM146)"; package IM::MsgStore; require 5.003; diff --git a/img/lib/IM/Nntp.pm b/img/lib/IM/Nntp.pm index 3778e12f..87bfea19 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: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::Nntp.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::Nntp.pm version 20031028(IM146)"; package IM::Nntp; require 5.003; @@ -170,23 +170,15 @@ sub nntp_head_as_string($) { im_notice("getting article $i.\n"); $rc = &tcp_command(\*NNTPd, "HEAD $i", ''); - next if ($rc > 0); - if ($rc < 0) { + if ($rc != 0) { im_warn("HEAD command failed.\n"); return -1; } $count++; my($found, $f) = (0, ''); alarm(nntp_timeout()) unless win95p(); - $! = 0; while (<NNTPd>) { - unless (win95p()) { - alarm(0); - if ($!) { # may be channel truoble - im_warn("lost connection for HEAD.\n"); - return -1; - } - } + alarm(0) unless win95p(); s/\r\n$/\n/; last if ($_ =~ /^\.\n$/); s/^\.//; @@ -194,6 +186,11 @@ sub nntp_head_as_string($) { $f .= $_; } alarm(0) unless win95p(); + if (!defined($_)) { + # may be channel trouble + im_warn("lost connection for HEAD.\n"); + return -1; + } return $f; } @@ -214,15 +211,8 @@ sub nntp_head($$) { $count++; my($found, $f) = (0, ''); alarm(nntp_timeout()) unless win95p(); - $! = 0; while (<NNTPd>) { - unless (win95p()) { - alarm(0); - if ($!) { # may be channel truoble - im_warn("lost connection for HEAD.\n"); - return -1; - } - } + alarm(0) unless win95p(); s/\r\n$/\n/; last if ($_ =~ /^\.\n$/); s/^\.//; @@ -236,6 +226,12 @@ sub nntp_head($$) { $found = 0; } } + alarm(0) unless win95p(); + if (!defined($_)) { + # may be channel trouble + im_warn("lost connection for HEAD.\n"); + return -1; + } $f =~ s/\n[ \t]*/ /g; $f = '(sender unknown)' unless ($f); print "From $f\n"; @@ -285,15 +281,8 @@ sub nntp_article($) { } my @Article = (); alarm(nntp_timeout()) unless win95p(); - $! = 0; while (<NNTPd>) { - unless (win95p()) { - alarm(0); - if ($!) { # may be channel truoble - im_warn("lost connection for ARTICLE.\n"); - return(-1, ''); - } - } + alarm(0) unless win95p(); s/\r\n$/\n/; last if ($_ =~ /^\.\n$/); s/^\.//; @@ -301,6 +290,11 @@ sub nntp_article($) { im_debug($_) if (&debug('nntp')); } alarm(0) unless win95p(); + if (!defined($_)) { + # may be channel trouble + im_warn("lost connection for ARTICLE.\n"); + return(-1, ''); + } return(0, \@Article); } diff --git a/img/lib/IM/Pop.pm b/img/lib/IM/Pop.pm index 50b8e300..0892a2ab 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: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::Pop.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::Pop.pm version 20031028(IM146)"; package IM::Pop; require 5.003; @@ -148,15 +148,8 @@ sub pop_retr($$$) { return -1; } alarm(pop_timeout()) unless win95p(); - $! = 0; while (<POPd>) { - unless (win95p()) { - alarm(0); - if ($!) { # may be channel truoble - im_warn("lost connection for RETR.\n"); - return -1; - } - } + alarm(0) unless win95p(); s/\r\n$/\n/; last if ($_ =~ /^\.\n$/); s/^\.//; @@ -164,6 +157,11 @@ sub pop_retr($$$) { push (@Message, $_); } alarm(0) unless win95p(); + if (!defined($_)) { + # may be channel trouble + im_warn("lost connection for RETR.\n"); + return -1; + } return -1 if (store_message(\@Message, $dst, $noscan) < 0); &exec_getsbrfile($dst); @@ -184,15 +182,8 @@ sub pop_head($) { my(%head); undef %head; alarm(pop_timeout()) unless win95p(); - $! = 0; while (<POPd>) { - unless (win95p()) { - alarm(0); - if ($!) { # may be channel truoble - im_warn("lost connection for HEAD.\n"); - return 0; - } - } + alarm(0) unless win95p(); s/\r?\n$//; last if ($_ =~ /^\.$/); s/^\.//; @@ -214,6 +205,11 @@ sub pop_head($) { } } alarm(0) unless win95p(); + if (!defined($_)) { + # may be channel trouble + im_warn("lost connection for HEAD.\n"); + return 0; + } return \%head; } @@ -238,15 +234,8 @@ sub pop_uidl($) { return -1; } alarm(pop_timeout()) unless win95p(); - $! = 0; while (<POPd>) { - unless (win95p()) { - alarm(0); - if ($!) { # may be channel truoble - im_warn("lost connection for UIDL.\n"); - return -1; - } - } + alarm(0) unless win95p(); s/\r\n$/\n/; last if ($_ =~ /^\.\n$/); im_debug($_) if (&debug('pop')); @@ -255,6 +244,11 @@ sub pop_uidl($) { } } alarm(0) unless win95p(); + if (!defined($_)) { + # may be channel trouble + im_warn("lost connection for UIDL.\n"); + return -1; + } return 0; } diff --git a/img/lib/IM/Recipient.pm b/img/lib/IM/Recipient.pm index 917cd9a1..583d7016 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: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::Recipient.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::Recipient.pm version 20031028(IM146)"; package IM::Recipient; require 5.003; diff --git a/img/lib/IM/Scan.pm b/img/lib/IM/Scan.pm index 0a465a9f..deb2dbd9 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: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::Scan.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::Scan.pm version 20031028(IM146)"; package IM::Scan; require 5.003; diff --git a/img/lib/IM/Smtp.pm b/img/lib/IM/Smtp.pm index 5b9421ca..2839b5c1 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: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::Smtp.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::Smtp.pm version 20031028(IM146)"; package IM::Smtp; require 5.003; diff --git a/img/lib/IM/Ssh.pm b/img/lib/IM/Ssh.pm index b997992d..cc411d11 100644 --- a/img/lib/IM/Ssh.pm +++ b/img/lib/IM/Ssh.pm @@ -6,10 +6,10 @@ ### Author: Masatoshi Tsuchiya <tsuchiya@pine.kuee.kyoto-u.ac.jp> ### Internet Message Group <img@mew.org> ### Created: Oct 05, 1999 -### Revised: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::Ssh.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::Ssh.pm version 20031028(IM146)"; package IM::Ssh; require 5.003; diff --git a/img/lib/IM/Stdio.pm b/img/lib/IM/Stdio.pm index bae416ea..6b7be57f 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: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::Stdio.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::Stdio.pm version 20031028(IM146)"; package IM::Stdio; require 5.003; diff --git a/img/lib/IM/TcpTransaction.pm b/img/lib/IM/TcpTransaction.pm index 051cfc73..0579ac29 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: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::TcpTransaction.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::TcpTransaction.pm version 20031028(IM146)"; package IM::TcpTransaction; require 5.003; @@ -207,7 +207,7 @@ sub tcp_command($$$) { im_notice("<<< $logcmd\n"); $Session_log .= "<<< $logcmd\n" if ($Logging); unless (print $CHAN "$command\r\n") { - # may be channel truoble + # may be channel trouble @Response = ($!); return 1; } @@ -220,14 +220,15 @@ sub tcp_command($$$) { } do { alarm(command_timeout()) unless win95p(); - $! = 0; $resp = <$CHAN>; - unless (win95p()) { - alarm(0); - if ($!) { # may be channel truoble - @Response = ("$!"); - return 1; - } + if (!defined($resp)) { + # may be channel trouble + @Response = ("$!"); + } + alarm(0) unless win95p(); + if (!defined($resp)) { + # may be channel trouble + return 1; } $resp =~ s/[\r\n]+$//; if ($resp =~ /^([0-9][0-9][0-9])/) { @@ -268,14 +269,15 @@ sub send_command($$$) { $0 = progname() . ": greeting ($Cur_server)"; } alarm(command_timeout()) unless win95p(); - $! = 0; $resp = <$CHAN>; - unless (win95p()) { - alarm(0); - if ($!) { # may be channel truoble - im_notice("$!\n"); - return ''; - } + if (!defined($resp)) { + # may be channel trouble + im_notice("$!\n"); + } + alarm(0) unless win95p(); + if (!defined($resp)) { + # may be channel trouble + return ''; } $resp =~ s/[\r\n]+/\n/; im_notice(">>> $resp"); @@ -303,14 +305,15 @@ sub next_response($) { my $resp; alarm(command_timeout()) unless win95p(); - $! = 0; $resp = <$CHAN>; - unless (win95p()) { - alarm(0); - if ($!) { # may be channel truoble - im_notice("$!\n"); - return ''; - } + if (!defined($resp)) { + # may be channel trouble + im_notice("$!\n"); + } + alarm(0) unless win95p(); + if (!defined($resp)) { + # may be channel trouble + return ''; } $resp =~ s/[\r\n]+/\n/; im_notice(">>> $resp"); diff --git a/img/lib/IM/Util.pm b/img/lib/IM/Util.pm index 1591eacd..516a88a2 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: Jun 1, 2003 +### Revised: Oct 28, 2003 ### -my $PM_VERSION = "IM::Util.pm version 20030601(IM145)"; +my $PM_VERSION = "IM::Util.pm version 20031028(IM146)"; package IM::Util; require 5.003; |