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

lib9: do not try to hide symlinks as much

Browse source
This commit is contained in:
Russ Cox 2008-07-04 16:24:54 -04:00
parent bb53a229b2
commit 9a939d5f19
1 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/lib9/_p9dir.c
View file

@ -198,32 +198,33 @@ _p9dir(struct stat *lst, struct stat *st, char *name, Dir *d, char **str, char *
d->mtime = st->st_mtime; d->mtime = st->st_mtime;
d->length = st->st_size; d->length = st->st_size;
if(S_ISDIR(st->st_mode)){
d->length = 0;
d->mode |= DMDIR;
d->qid.type = QTDIR;
}
if(S_ISLNK(lst->st_mode)){ /* yes, lst not st */ if(S_ISLNK(lst->st_mode)){ /* yes, lst not st */
d->mode |= DMSYMLINK; d->mode |= DMSYMLINK;
d->length = lst->st_size; d->length = lst->st_size;
} }
if(S_ISFIFO(st->st_mode)) else if(S_ISDIR(st->st_mode)){
d->length = 0;
d->mode |= DMDIR;
d->qid.type = QTDIR;
}
else if(S_ISFIFO(st->st_mode))
d->mode |= DMNAMEDPIPE; d->mode |= DMNAMEDPIPE;
if(S_ISSOCK(st->st_mode)) else if(S_ISSOCK(st->st_mode))
d->mode |= DMSOCKET; d->mode |= DMSOCKET;
if(S_ISBLK(st->st_mode)){ else if(S_ISBLK(st->st_mode)){
d->mode |= DMDEVICE; d->mode |= DMDEVICE;
d->qid.path = ('b'<<16)|st->st_rdev; d->qid.path = ('b'<<16)|st->st_rdev;
} }
if(S_ISCHR(st->st_mode)){ else if(S_ISCHR(st->st_mode)){
d->mode |= DMDEVICE; d->mode |= DMDEVICE;
d->qid.path = ('c'<<16)|st->st_rdev; d->qid.path = ('c'<<16)|st->st_rdev;
} }
/* fetch real size for disks */ /* fetch real size for disks */
if(S_ISBLK(st->st_mode) || S_ISCHR(st->st_mode)) if(S_ISBLK(lst->st_mode) || S_ISCHR(lst->st_mode)){
if((fd = open(name, O_RDONLY)) >= 0){ if((fd = open(name, O_RDONLY)) >= 0){
d->length = disksize(fd, st); d->length = disksize(fd, st);
close(fd); close(fd);
}
} }
} }