commit 5f0c20ec14dc1c97519e0843d715fd91b430e77c
parent 5bbba977d1257659485a924d01f1975e5d5f2c91
Author: rsc <rsc>
Date: Wed, 8 Aug 2007 09:08:29 +0000
fix . .. unlink bug
Diffstat:
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/BUGS b/BUGS
@@ -33,7 +33,5 @@ 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
wdir keep in fs.c)
- unlink . and .. should be disallowed
-
ls.c: apply tim's patch
diff --git a/fs.c b/fs.c
@@ -579,6 +579,12 @@ namei(char *path, int mode, uint *ret_off,
found:
if(mode == NAMEI_DELETE && *cp == '\0'){
+ // can't unlink . and ..
+ if((i == 1 && memcmp(cp-1, ".", 1) == 0) ||
+ (i == 2 && memcmp(cp-2, "..", 2) == 0)){
+ iput(dp);
+ return 0;
+ }
*ret_off = off;
return dp;
}