mocksetup: /unsafe+/hdd -> /quad

[nethome.git] / bin / cvsutil

diff --git a/bin/cvsutil b/bin/cvsutil
index 8457ee4..72c19d5 100755 (executable)
--- a/bin/cvsutil
+++ b/bin/cvsutil
@@ -16,6 +16,22 @@ use warnings;
 use Getopt::Long;
 use Cwd qw(chdir fastgetcwd);
 use Errno qw(ENOENT);
+use Carp qw(confess cluck croak carp);
+BEGIN {
+       if (!eval q{ use File::Remove qw(remove); 1; }) {{
+               sub main::remove(@)
+               {
+                       my $r="";
+                       if ("SCALAR" eq ref $_[0]) {
+                               $r="-r" if ${$_[0]};
+                               shift;
+                               }
+                       my $cmd="rm -f $r ".join(" ",map({s/'/'\\''/g;"'$_'";} @_));
+                       my $err=system($cmd) and confess("$cmd: $cmd");
+                       return @_;
+               }
+               }}
+}
 
 use constant ENTRIES  =>"CVS/Entries";
 use constant CVSIGNORE=>".cvsignore";
@@ -85,8 +101,8 @@ my($msg,%opts)=@_;
 
        my $errstr=$!;
        $msg.=" in \"".fastgetcwd."\" (CVS \"$dir_dirname\")".($opts{"noerrno"} ? "" : ": $errstr");
-       die $msg if $opt_fatal;
-       warn $msg;
+       croak $msg if $opt_fatal;
+       carp $msg;
 }
 
 sub fordirs
@@ -148,9 +164,12 @@ sub localreaddir
                }
        while (<E>) {
                chomp;
+               next if /^D$/;
                do { push @dir_dirs ,$1; next; } if m#^D/([^/]*)/#;
+               next if m#^/[^/]*/-#;   # deleted file: /filename/-1.1/dummy timestamp//
+               # New file is a valid entry!
+               # next if m#^/[^/]*/0/#;        # new file: /filename/0/dummy timestamp//
                do { push @dir_files,$1; next; } if m#^/([^/]*)/# ;
-               next if /^D$/;
                mayfatal "File ".ENTRIES." contains invalid line \"$_\"",("noerrno"=>1);
                }
        close E;
@@ -203,9 +222,14 @@ sub localactionrm
 {
 my($filename)=@_;
 
-       if (!unlink $filename) {
+       # &chmod follows the symlinks.
+       -l $filename or chmod 0700,$filename or do {
+               mayfatal "File \"$_\" cannot be chmod(2)ed" if !$!{ENOENT};
+               };
+       # '\1' for '-r':
+       remove \1,$filename or do {
                mayfatal "File \"$_\" cannot be removed" if !$!{ENOENT};
-               }
+               };
 }
 
 sub localactionrootset