treewide: shorten temporary filename

File::Temp only requires four 'X' characters (unlike mkstemp(3),
which requires six).  So only so only give it 4 to avoid an
80-column violation and maybe save metadata space on FSes.

diff --git a/lib/PublicInbox/LeiOverview.pm b/lib/PublicInbox/LeiOverview.pm
index 8e26cba48c02d1020800600bf34b636c7610e215..68f6c792d67aad4221f61872b0a0d8585f4e511c 100644 (file)
--- a/lib/PublicInbox/LeiOverview.pm
+++ b/lib/PublicInbox/LeiOverview.pm
@@ -26,7 +26,7 @@ sub _iso8601 ($) { strftime('%Y-%m-%dT%H:%M:%SZ', gmtime($_[0])) }
 # we open this in the parent process before ->wq_io_do handoff
 sub ovv_out_lk_init ($) {
        my ($self) = @_;
-       my $tmp = File::Temp->new("lei-ovv.dst.$$.lock-XXXXXX",
+       my $tmp = File::Temp->new("lei-ovv.dst.$$.lock-XXXX",
                                        TMPDIR => 1, UNLINK => 0);
        $self->{"lk_id.$self.$$"} = $self->{lock_path} = $tmp->filename;
 }

diff --git a/lib/PublicInbox/Msgmap.pm b/lib/PublicInbox/Msgmap.pm
index 826c4b300a0d88370478fd608d4742fa37cd772e..16a9a476407f7ff30b722c7501d85a76d6f5c842 100644 (file)
--- a/lib/PublicInbox/Msgmap.pm
+++ b/lib/PublicInbox/Msgmap.pm
@@ -46,7 +46,7 @@ sub new_file {
 sub tmp_clone {
        my ($self, $dir) = @_;
        require File::Temp;
-       my $tmp = "mm_tmp-$$-XXXXXX";
+       my $tmp = "mm_tmp-$$-XXXX";
        my ($fh, $fn) = File::Temp::tempfile($tmp, EXLOCK => 0, DIR => $dir);
        PublicInbox::Spawn::nodatacow_fd(fileno($fh));
        $self->{dbh}->sqlite_backup_to_file($fn);

diff --git a/lib/PublicInbox/SolverGit.pm b/lib/PublicInbox/SolverGit.pm
index 1d70975e855b48b08811594987015a28a1c13296..92106e75ee97d3b1f9e543d57cc10b21282b19af 100644 (file)
--- a/lib/PublicInbox/SolverGit.pm
+++ b/lib/PublicInbox/SolverGit.pm
@@ -681,7 +681,7 @@ sub solve ($$$$$) {
        $self->{todo} = [ { %$hints, oid_b => $oid_want } ];
        $self->{patches} = []; # [ $di, $di, ... ]
        $self->{found} = {}; # { abbr => [ ::Git, oid, type, size, $di ] }
-       $self->{tmp} = File::Temp->newdir("solver.$oid_want-XXXXXXXX", TMPDIR => 1);
+       $self->{tmp} = File::Temp->newdir("solver.$oid_want-XXXX", TMPDIR => 1);
 
        dbg($self, "solving $oid_want ...");
        if (my $async = $env->{'pi-httpd.async'}) {

diff --git a/lib/PublicInbox/TestCommon.pm b/lib/PublicInbox/TestCommon.pm
index d36a63aa29aaa310c4b647db0e22150b1a3bfaa4..d6e090dd14b3780b855b5afbdd2380559063bcc2 100644 (file)
--- a/lib/PublicInbox/TestCommon.pm
+++ b/lib/PublicInbox/TestCommon.pm
@@ -40,7 +40,7 @@ sub tmpdir (;$) {
        unless (defined $base) {
                ($base) = ($0 =~ m!\b([^/]+)\.[^\.]+\z!);
        }
-       my $tmpdir = File::Temp->newdir("pi-$base-$$-XXXXXX", TMPDIR => 1);
+       my $tmpdir = File::Temp->newdir("pi-$base-$$-XXXX", TMPDIR => 1);
        ($tmpdir->dirname, $tmpdir);
 }
 

diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm
index 4130a4728feff01314166d9a7528fc96d4e6fe4b..0461257feb7b483329d09f4b0e5e75f9b5913b0d 100644 (file)
--- a/lib/PublicInbox/V2Writable.pm
+++ b/lib/PublicInbox/V2Writable.pm
@@ -660,7 +660,7 @@ sub done {
 
 sub write_alternates ($$$) {
        my ($info_dir, $mode, $out) = @_;
-       my $fh = File::Temp->new(TEMPLATE => 'alt-XXXXXXXX', DIR => $info_dir);
+       my $fh = File::Temp->new(TEMPLATE => 'alt-XXXX', DIR => $info_dir);
        my $tmp = $fh->filename;
        print $fh @$out or die "print $tmp: $!\n";
        chmod($mode, $fh) or die "fchmod $tmp: $!\n";
@@ -772,11 +772,11 @@ sub import_init {
 sub diff ($$$) {
        my ($mid, $cur, $new) = @_;
 
-       my $ah = File::Temp->new(TEMPLATE => 'email-cur-XXXXXXXX', TMPDIR => 1);
+       my $ah = File::Temp->new(TEMPLATE => 'email-cur-XXXX', TMPDIR => 1);
        print $ah $cur->as_string or die "print: $!";
        $ah->flush or die "flush: $!";
        PublicInbox::Import::drop_unwanted_headers($new);
-       my $bh = File::Temp->new(TEMPLATE => 'email-new-XXXXXXXX', TMPDIR => 1);
+       my $bh = File::Temp->new(TEMPLATE => 'email-new-XXXX', TMPDIR => 1);
        print $bh $new->as_string or die "print: $!";
        $bh->flush or die "flush: $!";
        my $cmd = [ qw(diff -u), $ah->filename, $bh->filename ];

diff --git a/lib/PublicInbox/Xapcmd.pm b/lib/PublicInbox/Xapcmd.pm
index e2d67f6ac85e3cb40031556c3aacb4250ad283db..9791f02cf76aaf7ecff9d8f8419d5b2843a41ec1 100644 (file)
--- a/lib/PublicInbox/Xapcmd.pm
+++ b/lib/PublicInbox/Xapcmd.pm
@@ -192,7 +192,7 @@ sub prepare_run {
                my $dir = dirname($old);
                same_fs_or_die($dir, $old);
                my $v = PublicInbox::Search::SCHEMA_VERSION();
-               my $wip = File::Temp->newdir("xapian$v-XXXXXXXX", DIR => $dir);
+               my $wip = File::Temp->newdir("xapian$v-XXXX", DIR => $dir);
                $tmp->{$old} = $wip;
                nodatacow_dir($wip->dirname);
                push @queue, [ $old, $wip ];
@@ -220,8 +220,7 @@ sub prepare_run {
                        $src = [ map { "$old/$_" } @old_shards ];
                }
                foreach my $dn (0..$max_shard) {
-                       my $tmpl = "$dn-XXXXXXXX";
-                       my $wip = File::Temp->newdir($tmpl, DIR => $old);
+                       my $wip = File::Temp->newdir("$dn-XXXX", DIR => $old);
                        same_fs_or_die($old, $wip->dirname);
                        my $cur = "$old/$dn";
                        push @queue, [ $src // $cur , $wip ];
@@ -291,7 +290,7 @@ sub cpdb_retryable ($$) {
 }
 
 sub progress_pfx ($) {
-       my ($wip) = @_; # tempdir v2: ([0-9])+-XXXXXXXX
+       my ($wip) = @_; # tempdir v2: ([0-9])+-XXXX
        my @p = split('/', $wip);
 
        # return "xap15/0" for v2, or "xapian15" for v1:
@@ -418,7 +417,7 @@ sub cpdb ($$) { # cb_spawn callback
        if ($opt->{compact}) {
                my $dir = dirname($new);
                same_fs_or_die($dir, $new);
-               $ft = File::Temp->newdir("$new.compact-XXXXXX", DIR => $dir);
+               $ft = File::Temp->newdir("$new.compact-XXXX", DIR => $dir);
                setup_signals();
                $tmp = $ft->dirname;
                nodatacow_dir($tmp);

diff --git a/script/public-inbox-edit b/script/public-inbox-edit
index 1c6c4e4a08e24fa32484a893487e39826830f359..9498038b29e4df2c020eef94446e857905f04f8e 100755 (executable)
--- a/script/public-inbox-edit
+++ b/script/public-inbox-edit
@@ -133,7 +133,7 @@ $mids
 }
 
 my %tmpopt = (
-       TEMPLATE => 'public-inbox-edit-XXXXXX',
+       TEMPLATE => 'public-inbox-edit-XXXX',
        TMPDIR => 1,
        SUFFIX => $opt->{raw} ? '.eml' : '.mbox',
 );

diff --git a/script/public-inbox-init b/script/public-inbox-init
index e93cab730d209442fd05176b4555e4f2e0d9c8eb..335eb476baa16ffa613f0e8853387eb0ab5f7bb5 100755 (executable)
--- a/script/public-inbox-init
+++ b/script/public-inbox-init
@@ -79,7 +79,7 @@ PublicInbox::Lock::lock_acquire($lock_obj);
 
 # git-config will operate on this (and rename on success):
 require File::Temp;
-my $fh = File::Temp->new(TEMPLATE => 'pi-init-XXXXXXXX', DIR => $dir);
+my $fh = File::Temp->new(TEMPLATE => 'pi-init-XXXX', DIR => $dir);
 
 # Now, we grab another lock to use git-config(1) locking, so it won't
 # wait on the lock, unlike some of our internal flock()-based locks.

diff --git a/scripts/ssoma-replay b/scripts/ssoma-replay
index cfb0fbd91ff215f2c895443bdab0c2592bca4966..70d0081dcd7426c95cd429b932f03d064a09216a 100755 (executable)
--- a/scripts/ssoma-replay
+++ b/scripts/ssoma-replay
@@ -29,7 +29,7 @@ use strict;
 use Email::Simple;
 use URI::Escape qw/uri_escape_utf8/;
 use File::Temp qw/tempfile/;
-my ($fh, $filename) = tempfile('ssoma-replay-XXXXXXXX', TMPDIR => 1);
+my ($fh, $filename) = tempfile('ssoma-replay-XXXX', TMPDIR => 1);
 my $msg = Email::Simple->new(do { local $/; <STDIN> });
 select $fh;
 

diff --git a/t/check-www-inbox.perl b/t/check-www-inbox.perl
index eee8adc256ac5f5efac755e7f7e776141f22b657..033b90d174dc16d4ccca8bc2a1c2ab189b2ca0af 100644 (file)
--- a/t/check-www-inbox.perl
+++ b/t/check-www-inbox.perl
@@ -91,7 +91,7 @@ foreach my $p (1..$nproc) {
        }
 }
 
-my ($fh, $tmp) = tempfile('www-check-XXXXXXXX',
+my ($fh, $tmp) = tempfile('www-check-XXXX',
                        SUFFIX => '.gdbm', UNLINK => 1, TMPDIR => 1);
 my $gdbm = tie my %seen, 'GDBM_File', $tmp, &GDBM_WRCREAT, 0600;
 defined $gdbm or die "gdbm open failed: $!\n";

diff --git a/t/inbox.t b/t/inbox.t
index b7239e6d6fe96ba4f1c800f82986259f2d41d983..0580cd231f7a60b31d0579013a51e411e765d522 100644 (file)
--- a/t/inbox.t
+++ b/t/inbox.t
@@ -13,7 +13,7 @@ is($x->base_url, 'http://example.com/test/', 'added trailing slash');
 $x = PublicInbox::Inbox->new({});
 
 is($x->base_url, undef, 'undef base_url allowed');
-my $tmpdir = File::Temp->newdir('pi-inbox-XXXXXX', TMPDIR => 1);
+my $tmpdir = File::Temp->newdir('pi-inbox-XXXX', TMPDIR => 1);
 $x->{inboxdir} = $tmpdir->dirname;
 is_deeply($x->cloneurl, [], 'no cloneurls');
 is($x->description, '($INBOX_DIR/description missing)', 'default description');

diff --git a/t/nodatacow.t b/t/nodatacow.t
index 72860d4383ed1e16b23f33596356385af9cfef4e..9b67c521ffab7ff94e7986735c47683982c89856 100644 (file)
--- a/t/nodatacow.t
+++ b/t/nodatacow.t
@@ -15,7 +15,7 @@ SKIP: {
        skip 'BTRFS_TESTDIR not defined', $nr unless defined $dir;
        skip 'chattr(1) not installed', $nr unless which('chattr');
        my $lsattr = which('lsattr') or skip 'lsattr(1) not installed', $nr;
-       my $tmp = File::Temp->newdir('nodatacow-XXXXX', DIR => $dir);
+       my $tmp = File::Temp->newdir('nodatacow-XXXX', DIR => $dir);
        my $dn = $tmp->dirname;
 
        my $name = "$dn/pp.f";