fbt/sbase
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix rm -r

Browse Source
This commit is contained in:
Connor Lane Smith 2011-05-24 13:04:56 +01:00
parent fbb80983ce
commit 78fd8698cc
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rm.c
View File

@ -39,9 +39,17 @@ void rm(const char *path)
if(remove(path) == 0) if(remove(path) == 0)
return; return;
if(errno == ENOTEMPTY && rflag) { if(errno == ENOTEMPTY && rflag) {
char *buf;
long size;
struct dirent *d; struct dirent *d;
DIR *dp; DIR *dp;
if((size = pathconf(".", _PC_PATH_MAX)) < 0)
size = BUFSIZ;
if(!(buf = malloc(size)))
eprintf("malloc:");
if(!getcwd(buf, size))
eprintf("getcwd:");
if(!(dp = opendir(path))) if(!(dp = opendir(path)))
eprintf("opendir %s:", path); eprintf("opendir %s:", path);
if(chdir(path) != 0) if(chdir(path) != 0)
@ -51,8 +59,8 @@ void rm(const char *path)
rm(d->d_name); rm(d->d_name);
closedir(dp); closedir(dp);
if(chdir("..") != 0) if(chdir(buf) != 0)
eprintf("chdir:"); eprintf("chdir %s:", buf);
if(remove(path) == 0) if(remove(path) == 0)
return; return;
} }