o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

unvac, vacfs: allow literal vac scores in addition to file names

Browse source
This commit is contained in:
Russ Cox 2008-06-14 13:41:07 -04:00
parent 405d555fe4
commit 70c9f86c10
1 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/cmd/vac/fs.c
View file

@ -49,17 +49,23 @@ vacfsopen(VtConn *z, char *file, int mode, int ncache)
{ {
int fd; int fd;
uchar score[VtScoreSize]; uchar score[VtScoreSize];
char *prefix;
fd = open(file, OREAD);
if(fd < 0) if(vtparsescore(file, &prefix, score) >= 0){
return nil; if(strcmp(prefix, "vac") != 0){
werrstr("not a vac file");
if(readscore(fd, score) < 0){ return nil;
}
}else{
fd = open(file, OREAD);
if(fd < 0)
return nil;
if(readscore(fd, score) < 0){
close(fd);
return nil;
}
close(fd); close(fd);
return nil;
} }
close(fd);
return vacfsopenscore(z, score, mode, ncache); return vacfsopenscore(z, score, mode, ncache);
} }