tstart adding DM 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 0a2290523265287829036cbbc71e4cbbc80207d8
 (DIR) parent 8a26417b7abb3158012feb054f944ea32cc46272
 (HTM) Author: rsc <devnull@localhost>
       Date:   Tue,  8 Feb 2005 20:08:28 +0000
       
       start adding DM bits
       
       Diffstat:
         M src/lib9/_p9dir.c                   |       2 +-
         M src/lib9/dirfstat.c                 |       2 +-
         M src/lib9/dirread.c                  |      10 +++++++---
         M src/lib9/dirstat.c                  |      10 +++++++---
       
       4 files changed, 16 insertions(+), 8 deletions(-)
       ---
 (DIR) diff --git a/src/lib9/_p9dir.c b/src/lib9/_p9dir.c
       t@@ -80,7 +80,7 @@ disksize(int fd, int dev)
         * getpwnam in the first place, so I'm not too worried.
         */
        int
       -_p9dir(struct stat *st, char *name, Dir *d, char **str, char *estr)
       +_p9dir(struct stat *lst, struct stat *st, char *name, Dir *d, char **str, char *estr)
        {
                char *s;
                char tmp[20];
 (DIR) diff --git a/src/lib9/dirfstat.c b/src/lib9/dirfstat.c
       t@@ -23,7 +23,7 @@ dirfstat(int fd)
                if(d == nil)
                        return nil;
                str = (char*)&d[1];
       -        _p9dir(&st, tmp, d, &str, str+nstr);
       +        _p9dir(&st, &st, tmp, d, &str, str+nstr);
                return d;
        }
        
 (DIR) diff --git a/src/lib9/dirread.c b/src/lib9/dirread.c
       t@@ -82,10 +82,14 @@ dirpackage(int fd, char *buf, int n, Dir **dp)
                        de = (struct dirent*)p;
                        if(de->d_name[0] == 0)
                                /* nothing */ {}
       -                else if(stat(de->d_name, &st) < 0)
       +                else if(lstat(de->d_name, &lst) < 0)
                                de->d_name[0] = 0;
       -                else
       -                        nstr += _p9dir(&st, de->d_name, nil, nil, nil);
       +                else{
       +                        st = lst;
       +                        if((lst.st_mode&S_IFMT) == S_ISLNK)
       +                                stat(de->d_name, &st);
       +                        nstr += _p9dir(&lst, &st, de->d_name, nil, nil, nil);
       +                }
                        p += de->d_reclen;
                }
        
 (DIR) diff --git a/src/lib9/dirstat.c b/src/lib9/dirstat.c
       t@@ -9,20 +9,24 @@ extern int _p9dir(struct stat*, char*, Dir*, char**, char*);
        Dir*
        dirstat(char *file)
        {
       +        struct lstat lst;
                struct stat st;
                int nstr;
                Dir *d;
                char *str;
        
       -        if(stat(file, &st) < 0)
       +        if(lstat(file, &lst) < 0)
                        return nil;
       +        st = lst;
       +        if((lst.mode&S_IFMT) == S_ISLNK)
       +                stat(file, &st);
        
       -        nstr = _p9dir(&st, file, nil, nil, nil);
       +        nstr = _p9dir(&lst, &st, file, nil, nil, nil);
                d = mallocz(sizeof(Dir)+nstr, 1);
                if(d == nil)
                        return nil;
                str = (char*)&d[1];
       -        _p9dir(&st, file, d, &str, str+nstr);
       +        _p9dir(&lst, &st, file, d, &str, str+nstr);
                return d;
        }