From: Guilhem Moulin <guilhem@fripost.org>
Date: Mon, 7 Mar 2016 12:32:13 +0000 (+0100)
Subject: pullimap: Remove "logfile" config option.
X-Git-Url: https://git.g-eek.se/?a=commitdiff_plain;h=5d8b7a1bef1c1bb1a4efaeff9398f0ed81cb59b1;p=interimap.git

pullimap: Remove "logfile" config option.
---

diff --git a/interimap b/interimap
index 76174ee..d540686 100755
--- a/interimap
+++ b/interimap
@@ -72,6 +72,7 @@ die "Invalid mailbox name $_" foreach grep !/\A([\x01-\x7F]+)\z/, @ARGV;
 my $CONF = read_config( delete $CONFIG{config} // $NAME
                       , [qw/_ local remote/]
                       , database => qr/\A(\P{Control}+)\z/
+                      , logfile => qr/\A(\/\P{Control}+)\z/
                       , 'list-mailbox' => qr/\A([\x01-\x09\x0B\x0C\x0E-\x7F]+)\z/
                       , 'list-select-opts' => qr/\A([\x21\x23\x24\x26\x27\x2B-\x5B\x5E-\x7A\x7C-\x7E]+)\z/
                       , 'ignore-mailbox' => qr/\A([\x01-\x09\x0B\x0C\x0E-\x7F]+)\z/
diff --git a/lib/Net/IMAP/InterIMAP.pm b/lib/Net/IMAP/InterIMAP.pm
index 0f674ac..efa6b92 100644
--- a/lib/Net/IMAP/InterIMAP.pm
+++ b/lib/Net/IMAP/InterIMAP.pm
@@ -59,7 +59,6 @@ my %OPTIONS = (
     command => qr/\A(\P{Control}+)\z/,
     'null-stderr' => qr/\A(YES|NO)\z/i,
     compress => qr/\A($RE_ATOM_CHAR+(?: $RE_ATOM_CHAR+)*)\z/,
-    logfile => qr/\A(\/\P{Control}+)\z/,
     SSL_protocols => qr/\A(!?$RE_SSL_PROTO(?: !?$RE_SSL_PROTO)*)\z/,
     SSL_fingerprint => qr/\A((?:[A-Za-z0-9]+\$)?\p{AHex}+)\z/,
     SSL_cipherlist => qr/\A(\P{Control}+)\z/,
diff --git a/pullimap b/pullimap
index 692ec38..cca0ee8 100755
--- a/pullimap
+++ b/pullimap
@@ -64,7 +64,7 @@ my $CONF = read_config( delete $CONFIG{config} // $NAME,
                       , 'deliver-rcpt' => qr/\A(\P{Control}+)\z/
                       )->{$ARGV[0]};
 
-my ($MAILBOX, $STATE, $LOGGER_FD);
+my ($MAILBOX, $STATE);
 do {
     $MAILBOX = $CONF->{mailbox} // 'INBOX';
 
@@ -86,19 +86,6 @@ do {
     fcntl($STATE, F_SETFL, $flags | FD_CLOEXEC) or die "fcntl F_SETFL: $!";
 
     flock($STATE, LOCK_EX) or die "Can't flock $statefile: $!";
-
-
-    if (defined (my $logfile = $CONF->{logfile})) {
-        require 'POSIX.pm';
-        require 'Time/HiRes.pm';
-        open $LOGGER_FD, '>>', $logfile or die "Can't open $logfile: $!\n";
-        $LOGGER_FD->autoflush(1);
-        my $flags = fcntl($LOGGER_FD, F_GETFL, 0)       or die "fcntl F_GETFL: $!";
-        fcntl($LOGGER_FD, F_SETFL, $flags | FD_CLOEXEC) or die "fcntl F_SETFL: $!";
-    }
-    elsif ($CONFIG{debug}) {
-        $LOGGER_FD = \*STDERR;
-    }
 };
 
 
@@ -230,11 +217,12 @@ sub smtp_send(@) {
 # Initialize the cache from the statefile, then pull new messages from
 # the remote mailbox
 #
-my $IMAP = Net::IMAP::InterIMAP::->new( %$CONF, %CONFIG{qw/quiet debug/}, 'logger-fd' => $LOGGER_FD );
+$CONF->{'logger-fd'} = \*STDERR if $CONFIG{debug};
+my $IMAP = Net::IMAP::InterIMAP::->new( %$CONF, %CONFIG{qw/quiet debug/} );
 
 # Use BODY.PEEK[] so if something gets wrong, unpulled messages
 # won't be marked as \Seen in the mailbox
-my $ATTRS = join ' ', qw/ENVELOPE INTERNALDATE BODY.PEEK[]/;
+my $ATTRS = "ENVELOPE INTERNALDATE BODY.PEEK[]";
 
 # Pull new messages from IMAP and deliver them to SMTP, then update the
 # statefile