aboutsummaryrefslogtreecommitdiffstats
path: root/lib/Net/IMAP
diff options
context:
space:
mode:
authorGuilhem Moulin <guilhem@fripost.org>2016-03-09 21:15:41 +0100
committerGuilhem Moulin <guilhem@fripost.org>2016-03-09 21:15:41 +0100
commit1135600bcaacc7ad3a8d205f7987c5370dcc1688 (patch)
tree7af0993c6cdf19bde6dc92bc4361c5a48ad034fd /lib/Net/IMAP
parent435d6bb2731f0205ff0789e8abeca189e0a35204 (diff)
parentebacf74fdb3a507c6b0d865f4e9a8a6e59dbb10c (diff)
Merge branch 'master' into debian
Diffstat (limited to 'lib/Net/IMAP')
-rw-r--r--lib/Net/IMAP/InterIMAP.pm12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/Net/IMAP/InterIMAP.pm b/lib/Net/IMAP/InterIMAP.pm
index 785de38..73f55e8 100644
--- a/lib/Net/IMAP/InterIMAP.pm
+++ b/lib/Net/IMAP/InterIMAP.pm
@@ -23,7 +23,7 @@ use strict;
use Compress::Raw::Zlib qw/Z_OK Z_FULL_FLUSH Z_SYNC_FLUSH MAX_WBITS/;
use Config::Tiny ();
use Errno 'EINTR';
-use Fcntl qw/F_GETFL F_SETFL FD_CLOEXEC/;
+use Fcntl qw/F_GETFD F_SETFD FD_CLOEXEC/;
use Net::SSLeay ();
use List::Util qw/all first/;
use POSIX ':signal_h';
@@ -887,7 +887,7 @@ sub append($$@) {
delete $vanished2{$_} foreach keys %vanished;
my $VANISHED = scalar(keys %vanished2); # number of messages VANISHED meanwhile
$cache->{EXISTS} += $#_+1 if defined $cache->{EXISTS} and $cache->{EXISTS} + $VANISHED == $EXISTS;
- $cache->{UIDNEXT} = $UIDNEXT if ($cache->{UIDNEXT} // 1) < $UIDNEXT;
+ $cache->{UIDNEXT} = $UIDNEXT if ($cache->{UIDNEXT} // 1) < $UIDNEXT;
}
unless ($self->{quiet}) {
@@ -1027,7 +1027,7 @@ sub set_cache($$%) {
}
$self->logger("Update last clean state for $mailbox: ".
- '('.join(' ', map {"$_ $cache->{$_}"} keys %$cache).')')
+ '('.join(' ', map {"$_ $cache->{$_}"} grep {defined $cache->{$_}} keys %$cache).')')
if $self->{debug};
}
@@ -1053,7 +1053,7 @@ sub uidvalidity($;$) {
}
-# $self->set_cache(@attributes)
+# $self->get_cache(@attributes)
# Return the persistent cache for the mailbox currently selected. If
# some @attributes are given, return the list of values corresponding
# to these attributes.
@@ -1375,8 +1375,8 @@ sub _tcp_connect($$$) {
next if $! == EINTR; # try again if connect(2) was interrupted by a signal
next SOCKETS;
}
- my $flags = fcntl($s, F_GETFL, 0) or $self->panic("fcntl F_GETFL: $!");
- fcntl($s, F_SETFL, $flags | FD_CLOEXEC) or $self->panic("fcntl F_SETFL: $!");
+ my $flags = fcntl($s, F_GETFD, 0) or $self->panic("fcntl F_GETFD: $!");
+ fcntl($s, F_SETFD, $flags | FD_CLOEXEC) or $self->panic("fcntl F_SETFD: $!");
return $s;
}
$self->fail("Can't connect to $host:$port");