X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=regen_lib.pl;h=7d396c044728ef61a1fcd93e9898347714a010f9;hb=dcfdccf94c5ada3342776b740fd487168bef3ca3;hp=1c830a2cdcff43d36a2ccfbdbf1d16d245de3694;hpb=9ad884cb5e6c71bf010defc627075ba1610c8eba;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/regen_lib.pl b/regen_lib.pl
index 1c830a2..7d396c0 100644
--- a/regen_lib.pl
+++ b/regen_lib.pl
@@ -1,19 +1,20 @@
 #!/usr/bin/perl -w
 use strict;
-use vars qw($Is_W32 $Is_OS2 $Is_Cygwin $Is_NetWare $Needs_Write);
-use Config; # Remember, this is running using an existing perl
+use vars qw($Needs_Write $Verbose @Changed);
+use File::Compare;
+use Symbol;
 
 # Common functions needed by the regen scripts
 
-$Is_W32 = $^O eq 'MSWin32';
-$Is_OS2 = $^O eq 'os2';
-$Is_Cygwin = $^O eq 'cygwin';
-$Is_NetWare = $Config{osname} eq 'NetWare';
-if ($Is_NetWare) {
-  $Is_W32 = 0;
-}
+$Needs_Write = $^O eq 'cygwin' || $^O eq 'os2' || $^O eq 'MSWin32';
+
+$Verbose = 0;
+@ARGV = grep { not($_ eq '-q' and $Verbose = -1) }
+  grep { not($_ eq '-v' and $Verbose = 1) } @ARGV;
 
-$Needs_Write = $Is_OS2 || $Is_W32 || $Is_Cygwin || $Is_NetWare;
+END {
+  print STDOUT "Changed: @Changed\n" if @Changed;
+}
 
 sub safer_unlink {
   my @names = @_;
@@ -38,8 +39,32 @@ sub safer_rename_silent {
   rename $from, $to;
 }
 
-sub safer_rename {
+sub rename_if_different {
   my ($from, $to) = @_;
+
+  if (compare($from, $to) == 0) {
+      warn "no changes between '$from' & '$to'\n" if $Verbose > 0;
+      safer_unlink($from);
+      return;
+  }
+  warn "changed '$from' to '$to'\n" if $Verbose > 0;
+  push @Changed, $to unless $Verbose < 0;
   safer_rename_silent($from, $to) or die "renaming $from to $to: $!";
 }
+
+# Saf*er*, but not totally safe. And assumes always open for output.
+sub safer_open {
+    my $name = shift;
+    my $fh = gensym;
+    open $fh, ">$name" or die "Can't create $name: $!";
+    *{$fh}->{SCALAR} = $name;
+    binmode $fh;
+    $fh;
+}
+
+sub safer_close {
+    my $fh = shift;
+    close $fh or die 'Error closing ' . *{$fh}->{SCALAR} . ": $!";
+}
+
 1;