Log out before exiting.

2 files changed, 17 insertions, 11 deletions

diff --git a/imapsync b/imapsync
index 45b214f..b0226c3 100755
--- a/imapsync
+++ b/imapsync
@@ -1111,4 +1111,7 @@ while(1) {
     wait_notifications(900);
 }
 
-END { cleanup(); }
+END {
+    $_->logout() foreach grep defined, ($lIMAP, $rIMAP);
+    cleanup();
+}
diff --git a/lib/Net/IMAP/Sync.pm b/lib/Net/IMAP/Sync.pm
index 2a25720..47c6258 100644
--- a/lib/Net/IMAP/Sync.pm
+++ b/lib/Net/IMAP/Sync.pm
@@ -380,7 +380,7 @@ sub new($%) {
 sub DESTROY($) {
     my $self = shift;
     foreach (qw/STDIN STDOUT/) {
-        $self->{$_}->close()  if defined $self->{$_}  and $self->{$_}->opened();
+        $self->{$_}->close() if defined $self->{$_} and $self->{$_}->opened();
     }
 }
 
@@ -490,7 +490,8 @@ sub examine($$) {
 #   Issue a LOGOUT command.  Change the state to LOGOUT.
 sub logout($) {
     my $self = shift;
-    $self->_send('LOGOUT');
+    # don't bother if the connection is already closed
+    $self->_send('LOGOUT') if $self->{STDIN}->opened();
     $self->{_STATE} = 'LOGOUT';
     undef $self;
 }
@@ -1100,10 +1101,15 @@ sub _getline($;$) {
     my $self = shift;
     my $msg = shift // '';
 
-    my $x = $self->{STDOUT}->getline() // $self->panic("Can't read: $!");
-    $x =~ s/\r\n\z// or $self->panic($x);
-    $self->logger("S: $msg", $x) if $self->{debug};
-    return $x;
+    if ($self->{STDOUT}->opened()) {
+        my $x = $self->{STDOUT}->getline() // $self->panic("Can't read: $!");
+        $x =~ s/\r\n\z// or $self->panic($x);
+        $self->logger("S: $msg", $x) if $self->{debug};
+        return $x;
+    }
+    else {
+        undef $self;
+    }
 }
 
 
@@ -1452,10 +1458,7 @@ sub _resp($$;$$$) {
 
     if (s/\A\* //) {
         if (s/\ABYE //) {
-            foreach (qw/STDIN STDOUT/) {
-                $self->{$_}->close() if defined $self->{$_} and $self->{$_}->opened();
-            }
-            exit 0;
+            undef $self;
         }
         elsif (s/\A(?:OK|NO|BAD) //) {
             $self->_resp_text($_);