Changes to the cleanup_tmpfiles routine:

* local -> my.
* Don't chdir to /tmp.
* Use $TMPDIR to file the temporary files.
* Don't delete the temporary files if we're in debug mode.

1 files changed, 9 insertions, 8 deletions

diff --git a/CVSROOT/log_accum.pl b/CVSROOT/log_accum.pl
index d4c187c19fd4..1600dd7ebf90 100755
--- a/CVSROOT/log_accum.pl
+++ b/CVSROOT/log_accum.pl
@@ -110,17 +110,18 @@ my $CVSROOT       = $ENV{'CVSROOT'} || "/home/ncvs";
 ############################################################
 
 sub cleanup_tmpfiles {
-    local($wd, @files);
+    my @files;		# The list of temporary files.
+
+    # Don't clean up afterwards if in debug mode.
+    return if $DEBUG;
+
+    opendir DIR, $TMPDIR or die "Cannot open directory: $TMPDIR!";
+    push @files, grep /^$FILE_PREFIX\..*$PID$/, readdir(DIR);
+    closedir DIR;
 
-    $wd = `pwd`;
-    chdir("/tmp");
-    opendir(DIR, ".");
-    push(@files, grep(/^$FILE_PREFIX\..*$PID$/, readdir(DIR)));
-    closedir(DIR);
     foreach (@files) {
-	unlink $_;
+	unlink "$TMPDIR/$_";
     }
-    chdir($wd);
 }
 
 sub append_to_logfile {