commit - 8a26417b7abb3158012feb054f944ea32cc46272
commit + 0a2290523265287829036cbbc71e4cbbc80207d8
blob - 5726969bed8bd334fa21d030c7bd39e35b48d5ab
blob + 4f95932e57194b0aad342b4b642688c41cfe3e94
--- src/lib9/_p9dir.c
+++ src/lib9/_p9dir.c
* 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];
blob - e617bc2f0612f1047f1bbe01586115c6e271aaea
blob + 68427916f916475f3adf4a0c75ac95663bb5c077
--- src/lib9/dirfstat.c
+++ src/lib9/dirfstat.c
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;
}
blob - 0a72d62e4d0848176f0bd17fe7e322092faf9d4e
blob + e4ab3e535ab1d583a2bf0e764bc26e4e5e136ffc
--- src/lib9/dirread.c
+++ src/lib9/dirread.c
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;
}
blob - 253a905661eefb2e551080040f2ca697ddba3e06
blob + b46831ccd48da78c6e10ca9388ce5b56a2105e18
--- src/lib9/dirstat.c
+++ src/lib9/dirstat.c
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;
}