ilo-pona/xv6-65oo2
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Activity

make ls work on directories

Browse source
This commit is contained in:
rsc 2007-08-08 09:17:09 +00:00
parent 3fd50978a8
commit 2e51e12f09
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
BUGS
View file

@ -22,6 +22,3 @@ ide.c: synchronous disk write -> polling disk write. search for
fs.c: split all name operations off in name.c? (starting with namei but move fs.c: split all name operations off in name.c? (starting with namei but move
wdir keep in fs.c) wdir keep in fs.c)
ls.c: apply tim's patch

12
ls.c
View file

@ -25,6 +25,7 @@ main(int argc, char *argv[])
int fd; int fd;
uint off; uint off;
uint sz; uint sz;
char *p;
if(argc > 2){ if(argc > 2){
puts("Usage: ls [dir]\n"); puts("Usage: ls [dir]\n");
@ -63,8 +64,15 @@ main(int argc, char *argv[])
break; break;
} }
if(dirent.inum != 0) { if(dirent.inum != 0) {
// xxx prepend to name the pathname supplied to ls (e.g. .. in ls ..) p = buf;
if(stat (dirent.name, &st) < 0) { if(argc == 2) {
strcpy(p, argv[1]);
p += strlen(p);
if(*(p-1) != '/')
*p++ = '/';
}
strcpy(p, dirent.name);
if(stat(buf, &st) < 0) {
printf(1, "stat: failed %s\n", dirent.name); printf(1, "stat: failed %s\n", dirent.name);
continue; continue;
} }