root/ncdu-zig
1
0
Fork 0
mirror of https://code.blicky.net/yorhel/ncdu.git synced 2026-01-14 17:58:40 -09:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't try to delete a directory that's not empty

Browse source
This commit is contained in:
Yorhel 2009-04-28 11:00:13 +02:00
parent bba85675a9
commit 3610121dab
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/delete.c
View file

@ -185,7 +185,7 @@ int delete_dir(struct dir *dr) {
} }
if((r = chdir("..")) < 0) if((r = chdir("..")) < 0)
goto delete_nxt; goto delete_nxt;
r = rmdir(dr->name); r = dr->sub == NULL ? rmdir(dr->name) : 0;
} else } else
r = unlink(dr->name); r = unlink(dr->name);
@ -198,11 +198,11 @@ delete_nxt:
while(state == DS_FAILED) while(state == DS_FAILED)
if(input_handle(0)) if(input_handle(0))
return 1; return 1;
} else } else if(!(dr->flags & FF_DIR && dr->sub != NULL)) {
freedir(dr); freedir(dr);
if(r == -1 && root == dr) return 0;
return 1; }
return 0; return root == dr ? 1 : 0;
} }