s4-script: cleanup tmp files in minimial_includes.pl
authorAndrew Tridgell <tridge@samba.org>
Tue, 20 Oct 2009 03:31:50 +0000 (14:31 +1100)
committerAndrew Tridgell <tridge@samba.org>
Tue, 20 Oct 2009 05:04:36 +0000 (16:04 +1100)
also changes to use perl fns, instead of shell

source4/script/minimal_includes.pl

index d64409ed13de478b7957e6fcbc69f38bfe058c6e..990ff00025f5aeb5e0d058212ba3e447ecb1e11f 100755 (executable)
@@ -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($)