ward/publicscripts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix readrights

Browse source
This commit is contained in:
Ward Wouts 2004-01-25 15:27:10 +00:00
parent 7c72b0ac88
commit fd08e529ca
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
mycp/mycp
View file

@ -31,6 +31,7 @@ use vars qw(
$hostname $hostname
$cvspath $cvspath
$editor $editor
$catcmd
$cpcmd $cpcmd
$cvscmd $cvscmd
$mkdircmd $mkdircmd
@ -41,6 +42,7 @@ use vars qw(
$hostname = hostname(); $hostname = hostname();
#my $cvspath = "$ENV{HOME}/worktrees/systems/$hostname"; #my $cvspath = "$ENV{HOME}/worktrees/systems/$hostname";
$editor = "vi"; $editor = "vi";
$catcmd = "/bin/cat";
$cpcmd = "/bin/cp"; $cpcmd = "/bin/cp";
$cvscmd = "/usr/bin/cvs"; $cvscmd = "/usr/bin/cvs";
$mkdircmd = "/bin/mkdir"; $mkdircmd = "/bin/mkdir";
@ -324,12 +326,8 @@ sub cmptocvs($) {
sub cmp($$) { sub cmp($$) {
my $source = shift; my $source = shift;
my $target = shift; my $target = shift;
open(FH, "<$source") or die "Couldn't open file $source: $!"; my $sf = &slurp($source);
my $sf = do { local $/; <FH> }; my $tf = &slurp($target);
close(FH);
open(FH, "<$target") or die "Couldn't open file $target: $!";
my $tf = do { local $/; <FH> };
close(FH);
$tf eq $sf; $tf eq $sf;
} }
@ -368,7 +366,11 @@ sub fullpath($) {
sub slurp($) { sub slurp($) {
my $file = shift; my $file = shift;
if ( -r $file) {
open(FH, "<$file") or die "Couldn't open $file: $!"; open(FH, "<$file") or die "Couldn't open $file: $!";
} else {
open(FH, "$sudocmd $catcmd $file|") or die "Couldn't exec $sudocmd $catcmd $file: $!";
}
my $result = do { local $/; <FH>; }; my $result = do { local $/; <FH>; };
close FH; close FH;
return $result; return $result;