From 8585cf1a78c3352ef6a0d3b3f32f9aacc28b609c Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 20 Oct 2009 14:31:50 +1100
Subject: [PATCH] s4-script: cleanup tmp files in minimial_includes.pl

also changes to use perl fns, instead of shell
---
 source4/script/minimal_includes.pl | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/source4/script/minimal_includes.pl b/source4/script/minimal_includes.pl
index d64409ed13d..990ff00025f 100755
--- a/source4/script/minimal_includes.pl
+++ b/source4/script/minimal_includes.pl
@@ -67,7 +67,10 @@ sub test_include($$$$)
 
 	$lines->[$i] = "";
 
-	`/bin/mv -f $fname $fname.misaved` && die "failed to rename $fname";
+	my $mname = $fname . ".misaved";
+
+	unlink($mname);
+	rename($fname, $mname) || die "failed to rename $fname";
 	save_lines($fname, $lines);
 	
 	my $out = test_compile($fname);
@@ -79,6 +82,7 @@ sub test_include($$$$)
 				print "$fname: not removing system include $line\n";
 			} else {
 				print "$fname: removing $line\n";
+				unlink($mname);
 				return;
 			}
 		} else {
@@ -87,7 +91,7 @@ sub test_include($$$$)
 	}
 
 	$lines->[$i] = $line;
-	`/bin/mv -f $fname.misaved $fname` && die "failed to restore $fname";
+	rename($mname, $fname) || die "failed to restore $fname";
 }
 
 sub process_file($)
-- 
2.34.1