commit 2acd6fa6ff4948a90a2a7338afd9a96f94637f33 from: rsc date: Tue Feb 08 20:17:02 2005 UTC expose unix mode bits commit - 0a2290523265287829036cbbc71e4cbbc80207d8 commit + 2acd6fa6ff4948a90a2a7338afd9a96f94637f33 blob - 4f95932e57194b0aad342b4b642688c41cfe3e94 blob + 8a748b9df21bb886ce7fcd5b11b6925e77013026 --- src/lib9/_p9dir.c +++ src/lib9/_p9dir.c @@ -181,6 +181,20 @@ _p9dir(struct stat *lst, struct stat *st, char *name, d->qid.type = QTDIR; } + if(S_ISLNK(st->st_mode)) + d->mode |= DMSYMLINK; + if(S_ISFIFO(st->st_mode)) + d->mode |= DMNAMEDPIPE; + if(S_ISSOCK(st->st_mode)) + d->mode |= DMSOCKET; + if(S_ISBLK(st->st_mode)){ + d->mode |= DMDEVICE; + d->qid.path = ('b'<<16)|st->st_rdev; + } + if(S_ISCHR(st->st_mode)){ + d->mode |= DMDEVICE; + d->qid.path = ('c'<<16)|st->st_rdev; + } /* fetch real size for disks */ #ifdef _HAVEDISKSIZE if(S_ISBLK(st->st_mode) && (fd = open(name, O_RDONLY)) >= 0){ blob - 68427916f916475f3adf4a0c75ac95663bb5c077 blob + d1922bf91e697a4995f2793a61a3e875a06aa5c9 --- src/lib9/dirfstat.c +++ src/lib9/dirfstat.c @@ -4,7 +4,7 @@ #include -extern int _p9dir(struct stat*, char*, Dir*, char**, char*); +extern int _p9dir(struct stat*, struct stat*, char*, Dir*, char**, char*); Dir* dirfstat(int fd) @@ -18,7 +18,7 @@ dirfstat(int fd) return nil; snprint(tmp, sizeof tmp, "/dev/fd/%d", fd); - nstr = _p9dir(&st, tmp, nil, nil, nil); + nstr = _p9dir(&st, &st, tmp, nil, nil, nil); d = mallocz(sizeof(Dir)+nstr, 1); if(d == nil) return nil; blob - e4ab3e535ab1d583a2bf0e764bc26e4e5e136ffc blob + 44307ed721b01437a2969c62bc38cc5e76ccf06e --- src/lib9/dirread.c +++ src/lib9/dirread.c @@ -4,7 +4,7 @@ #include #include -extern int _p9dir(struct stat*, char*, Dir*, char**, char*); +extern int _p9dir(struct stat*, struct stat*, char*, Dir*, char**, char*); #if defined(__linux__) static int @@ -63,7 +63,7 @@ dirpackage(int fd, char *buf, int n, Dir **dp) char *p, *str, *estr; int i, nstr, m; struct dirent *de; - struct stat st; + struct stat st, lst; Dir *d; n = countde(buf, n); @@ -86,7 +86,7 @@ dirpackage(int fd, char *buf, int n, Dir **dp) de->d_name[0] = 0; else{ st = lst; - if((lst.st_mode&S_IFMT) == S_ISLNK) + if((lst.st_mode&S_IFMT) == S_IFLNK) stat(de->d_name, &st); nstr += _p9dir(&lst, &st, de->d_name, nil, nil, nil); } @@ -106,8 +106,12 @@ dirpackage(int fd, char *buf, int n, Dir **dp) m = 0; for(i=0; id_name[0] != 0 && stat(de->d_name, &st) >= 0) - _p9dir(&st, de->d_name, &d[m++], &str, estr); + if(de->d_name[0] != 0 && lstat(de->d_name, &st) >= 0){ + st = lst; + if((lst.st_mode&S_IFMT) == S_IFLNK) + stat(de->d_name, &st); + _p9dir(&lst, &st, de->d_name, &d[m++], &str, estr); + } p += de->d_reclen; } blob - b46831ccd48da78c6e10ca9388ce5b56a2105e18 blob + 187dea7a5c5120872be8d722899d5a1d0689e958 --- src/lib9/dirstat.c +++ src/lib9/dirstat.c @@ -4,12 +4,12 @@ #include -extern int _p9dir(struct stat*, char*, Dir*, char**, char*); +extern int _p9dir(struct stat*, struct stat*, char*, Dir*, char**, char*); Dir* dirstat(char *file) { - struct lstat lst; + struct stat lst; struct stat st; int nstr; Dir *d; @@ -18,7 +18,7 @@ dirstat(char *file) if(lstat(file, &lst) < 0) return nil; st = lst; - if((lst.mode&S_IFMT) == S_ISLNK) + if((lst.st_mode&S_IFMT) == S_IFLNK) stat(file, &st); nstr = _p9dir(&lst, &st, file, nil, nil, nil);