mocksetup: /unsafe+/hdd -> /quad

[nethome.git] / bin / cvsutil

diff --git a/bin/cvsutil b/bin/cvsutil
index 1048e97..72c19d5 100755 (executable)
--- a/bin/cvsutil
+++ b/bin/cvsutil
@@ -16,8 +16,22 @@ use warnings;
 use Getopt::Long;
 use Cwd qw(chdir fastgetcwd);
 use Errno qw(ENOENT);
-use File::Remove qw(remove);
 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";
@@ -153,7 +167,8 @@ sub localreaddir
                next if /^D$/;
                do { push @dir_dirs ,$1; next; } if m#^D/([^/]*)/#;
                next if m#^/[^/]*/-#;   # deleted file: /filename/-1.1/dummy timestamp//
-               next if m#^/[^/]*/0/#;  # new file: /filename/0/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#^/([^/]*)/# ;
                mayfatal "File ".ENTRIES." contains invalid line \"$_\"",("noerrno"=>1);
                }
@@ -207,10 +222,14 @@ sub localactionrm
 {
 my($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':
-       if (!remove \1,$filename) {
+       remove \1,$filename or do {
                mayfatal "File \"$_\" cannot be removed" if !$!{ENOENT};
-               }
+               };
 }
 
 sub localactionrootset