texpose unix mode bits - plan9port - [fork] Plan 9 from user space
(HTM) git clone git://src.adamsgaard.dk/plan9port
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
(DIR) LICENSE
---
(DIR) commit 2acd6fa6ff4948a90a2a7338afd9a96f94637f33
(DIR) parent 0a2290523265287829036cbbc71e4cbbc80207d8
(HTM) Author: rsc <devnull@localhost>
Date: Tue, 8 Feb 2005 20:17:02 +0000
expose unix mode bits
Diffstat:
M src/lib9/_p9dir.c | 14 ++++++++++++++
M src/lib9/dirfstat.c | 4 ++--
M src/lib9/dirread.c | 14 +++++++++-----
M src/lib9/dirstat.c | 6 +++---
4 files changed, 28 insertions(+), 10 deletions(-)
---
(DIR) diff --git a/src/lib9/_p9dir.c b/src/lib9/_p9dir.c
t@@ -181,6 +181,20 @@ _p9dir(struct stat *lst, struct stat *st, char *name, Dir *d, char **str, char *
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){
(DIR) diff --git a/src/lib9/dirfstat.c b/src/lib9/dirfstat.c
t@@ -4,7 +4,7 @@
#include <sys/stat.h>
-extern int _p9dir(struct stat*, char*, Dir*, char**, char*);
+extern int _p9dir(struct stat*, struct stat*, char*, Dir*, char**, char*);
Dir*
dirfstat(int fd)
t@@ -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;
(DIR) diff --git a/src/lib9/dirread.c b/src/lib9/dirread.c
t@@ -4,7 +4,7 @@
#include <sys/stat.h>
#include <dirent.h>
-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
t@@ -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);
t@@ -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);
}
t@@ -106,8 +106,12 @@ dirpackage(int fd, char *buf, int n, Dir **dp)
m = 0;
for(i=0; i<n; i++){
de = (struct dirent*)p;
- if(de->d_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;
}
(DIR) diff --git a/src/lib9/dirstat.c b/src/lib9/dirstat.c
t@@ -4,12 +4,12 @@
#include <sys/stat.h>
-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;
t@@ -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);