* vidir, zrun: Don't put temp files in the current directory. Closes: #429367

diff --git a/debian/changelog b/debian/changelog
index c856224ca608d2cf71252b332d73ff67a884c8c7..ced9aa0b2dcf8bd1cef5b23e1b4c2d6f2e57d378 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+moreutils (0.22) unstable; urgency=low
+
+  * vidir, zrun: Don't put temp files in the current directory. Closes: #429367
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 25 Jun 2007 16:08:14 -0400
+
 moreutils (0.21) unstable; urgency=low
 
   * Patch from Sergej Pupykin fixing ifdata -pN.

diff --git a/vidir b/vidir
index d482746f9ed10c70335f296d8599d816e5bb0d2b..6df58bd7dd73a2d0fc4659e388033d363fce2159 100755 (executable)
--- a/vidir
+++ b/vidir
@@ -60,6 +60,7 @@ Licensed under the GNU GPL.
 
 =cut
 
+use File::Spec;
 use File::Temp;
 use Getopt::Long;
 
@@ -90,7 +91,7 @@ foreach my $item (@ARGV) {
        }
 }
        
-my $tmp=File::Temp->new(template => "dirXXXXX");
+my $tmp=File::Temp->new(TEMPLATE => "dirXXXXX", DIR => File::Spec->tmpdir);
 open (OUT, ">".$tmp->filename) || die "$0: cannot write ".$tmp->filename.": $!\n";
 
 my %item;

diff --git a/zrun b/zrun
index 7d313e26947544bcd3b961bb49718a48a6e30371..7776db2d94f0d91a7783eab259ed9283f8c1703e 100755 (executable)
--- a/zrun
+++ b/zrun
@@ -32,6 +32,7 @@ Copyright 2006 by Chung-chieh Shan <ccshan@post.harvard.edu>
 use warnings;
 use strict;
 use IO::Handle;
+use File::Spec;
 use File::Temp qw{tempfile};
 
 my $program = shift;
@@ -47,7 +48,8 @@ foreach my $argument (@ARGV) {
                my $suffix = "-$2";
                my @preprocess = $3 eq "bz2" ? qw(bzip2 -d -c) : qw(gzip -d -c);
 
-               my ($fh, $tmpname) = tempfile(SUFFIX => $suffix, UNLINK => 1)
+               my ($fh, $tmpname) = tempfile(SUFFIX => $suffix,
+                       DIR => File::Spec->tmpdir, UNLINK => 1)
                        or die "zrun: cannot create temporary file: $!\n";
 
                if (my $child = fork) {