1 files changed, 7 insertions, 3 deletions
diff --git a/interimap b/interimap
index 9ba5d06..d4ff3fc 100755
--- a/interimap
+++ b/interimap
@@ -29,7 +29,7 @@ use Getopt::Long qw/:config posix_default no_ignore_case gnu_compat
                             bundling auto_version/;
 use DBI ':sql_types';
 use DBD::SQLite::Constants ':file_open';
-use Fcntl qw/F_GETFD F_SETFD FD_CLOEXEC/;
+use Fcntl qw/O_WRONLY O_CREAT O_EXCL F_GETFD F_SETFD FD_CLOEXEC/;
 use List::Util 'first';
 
 use lib "./lib";
@@ -160,6 +160,12 @@ $SIG{TERM} = sub { cleanup(); exit 0; };
 # Open (and maybe create) the database
 
 {
+    # don't auto-create in long-lived mode
+    unless ($CONFIG{watch} or -e $DBFILE) {
+        sysopen(my $fh, $DBFILE, O_WRONLY | O_CREAT | O_EXCL, 0600) or die "Can't create $DBFILE: $!";
+        close $fh or warn "close: $!";
+    }
+
     my $dbi_data_source = "dbi:SQLite:dbname=".$DBFILE;
     my %dbi_attrs = (
         AutoCommit => 0,
@@ -167,8 +173,6 @@ $SIG{TERM} = sub { cleanup(); exit 0; };
         sqlite_use_immediate_transaction => 1,
         sqlite_open_flags => SQLITE_OPEN_READWRITE
     );
-    # don't auto-create in long-lived mode
-    $dbi_attrs{sqlite_open_flags} |= SQLITE_OPEN_CREATE unless defined $CONFIG{watch};
 
     $DBH = DBI::->connect($dbi_data_source, undef, undef, \%dbi_attrs);
     $DBH->sqlite_busy_timeout(250);