fix readrights
This commit is contained in:
parent
7c72b0ac88
commit
fd08e529ca
1 changed files with 9 additions and 7 deletions
14
mycp/mycp
14
mycp/mycp
|
|
@ -31,6 +31,7 @@ use vars qw(
|
|||
$hostname
|
||||
$cvspath
|
||||
$editor
|
||||
$catcmd
|
||||
$cpcmd
|
||||
$cvscmd
|
||||
$mkdircmd
|
||||
|
|
@ -41,6 +42,7 @@ use vars qw(
|
|||
$hostname = hostname();
|
||||
#my $cvspath = "$ENV{HOME}/worktrees/systems/$hostname";
|
||||
$editor = "vi";
|
||||
$catcmd = "/bin/cat";
|
||||
$cpcmd = "/bin/cp";
|
||||
$cvscmd = "/usr/bin/cvs";
|
||||
$mkdircmd = "/bin/mkdir";
|
||||
|
|
@ -324,12 +326,8 @@ sub cmptocvs($) {
|
|||
sub cmp($$) {
|
||||
my $source = shift;
|
||||
my $target = shift;
|
||||
open(FH, "<$source") or die "Couldn't open file $source: $!";
|
||||
my $sf = do { local $/; <FH> };
|
||||
close(FH);
|
||||
open(FH, "<$target") or die "Couldn't open file $target: $!";
|
||||
my $tf = do { local $/; <FH> };
|
||||
close(FH);
|
||||
my $sf = &slurp($source);
|
||||
my $tf = &slurp($target);
|
||||
$tf eq $sf;
|
||||
}
|
||||
|
||||
|
|
@ -368,7 +366,11 @@ sub fullpath($) {
|
|||
|
||||
sub slurp($) {
|
||||
my $file = shift;
|
||||
if ( -r $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>; };
|
||||
close FH;
|
||||
return $result;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue