pullimap, interimap: Use $XDG_CONFIG_HOME/$NAME/config as config file.

1 files changed, 15 insertions, 20 deletions

diff --git a/interimap b/interimap
index 049b564..0f34bf9 100755
--- a/interimap
+++ b/interimap
@@ -30,7 +30,7 @@ use Fcntl qw/F_GETFD F_SETFD FD_CLOEXEC/;
 use List::Util 'first';
 
 use lib 'lib';
-use Net::IMAP::InterIMAP qw/read_config compact_set/;
+use Net::IMAP::InterIMAP qw/xdg_basedir read_config compact_set/;
 
 # Clean up PATH
 $ENV{PATH} = join ':', qw{/usr/bin /bin};
@@ -63,20 +63,24 @@ my $COMMAND = do {
 };
 usage(1) if defined $COMMAND and (($COMMAND eq 'delete' and !@ARGV) or ($COMMAND eq 'rename' and $#ARGV != 1));
 usage(1) if defined $COMMAND and (defined $CONFIG{watch} or defined $CONFIG{notify});
-usage(1) if $CONFIG{target} and !(defined $COMMAND and ($COMMAND eq 'delete'or $COMMAND eq 'rename'));
+usage(1) if $CONFIG{target} and !(defined $COMMAND and ($COMMAND eq 'delete' or $COMMAND eq 'rename'));
 $CONFIG{watch} = $CONFIG{notify} ? 900 : 60 if (defined $CONFIG{watch} or $CONFIG{notify}) and !$CONFIG{watch};
 @ARGV = map {uc $_ eq 'INBOX' ? 'INBOX' : $_ } @ARGV; # INBOX is case-insensitive
 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/
-                      );
+my $CONF = do {
+    my $conffile = delete($CONFIG{config}) // "config";
+    $conffile = xdg_basedir( XDG_CONFIG_HOME => ".config", $NAME, $conffile );
+    read_config( $conffile
+               , [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/
+               );
+};
 my ($DBFILE, $LOGGER_FD);
 
 {
@@ -84,16 +88,7 @@ my ($DBFILE, $LOGGER_FD);
     $DBFILE //= $CONF->{remote}->{host}.'.db' if defined $CONF->{remote};
     $DBFILE //= $CONF->{local}->{host}. '.db' if defined $CONF->{local};
     die "Missing option database" unless defined $DBFILE;
-
-    unless ($DBFILE =~ /\A\//) {
-        my $dir = ($ENV{XDG_DATA_HOME} // "$ENV{HOME}/.local/share") .'/'. $NAME;
-        $dir =~ /\A(\/\p{Print}+)\z/ or die "Insecure $dir";
-        $dir = $1;
-        $DBFILE = $dir .'/'. $DBFILE;
-        unless (-d $dir) {
-            mkdir $dir, 0700 or die "Can't mkdir $dir: $!\n";
-        }
-    }
+    $DBFILE = xdg_basedir( XDG_DATA_HOME => ".local/share", $NAME, $DBFILE );
 
     if (defined $CONF->{_} and defined $CONF->{_}->{logfile}) {
         require 'POSIX.pm';