summaryrefslogtreecommitdiff
path: root/img/lib
diff options
context:
space:
mode:
Diffstat (limited to 'img/lib')
-rw-r--r--img/lib/IM/Address.pm4
-rw-r--r--img/lib/IM/Alias.pm4
-rw-r--r--img/lib/IM/Config.pm.in4
-rw-r--r--img/lib/IM/EncDec.pm4
-rw-r--r--img/lib/IM/File.pm4
-rw-r--r--img/lib/IM/Folder.pm4
-rw-r--r--img/lib/IM/GetPass.pm4
-rw-r--r--img/lib/IM/Grep.pm4
-rw-r--r--img/lib/IM/History.pm4
-rw-r--r--img/lib/IM/Http.pm4
-rw-r--r--img/lib/IM/Imap.pm60
-rw-r--r--img/lib/IM/Iso2022jp.pm4
-rw-r--r--img/lib/IM/Japanese.pm4
-rw-r--r--img/lib/IM/LocalMbox.pm4
-rw-r--r--img/lib/IM/Log.pm4
-rw-r--r--img/lib/IM/MD5.pm4
-rw-r--r--img/lib/IM/Message.pm4
-rw-r--r--img/lib/IM/MsgStore.pm4
-rw-r--r--img/lib/IM/Nntp.pm50
-rw-r--r--img/lib/IM/Pop.pm46
-rw-r--r--img/lib/IM/Recipient.pm4
-rw-r--r--img/lib/IM/Scan.pm4
-rw-r--r--img/lib/IM/Smtp.pm4
-rw-r--r--img/lib/IM/Ssh.pm4
-rw-r--r--img/lib/IM/Stdio.pm4
-rw-r--r--img/lib/IM/TcpTransaction.pm51
-rw-r--r--img/lib/IM/Util.pm4
27 files changed, 141 insertions, 158 deletions
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;