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

Actually delete parents as well when deleting directories

Browse source
This commit is contained in:
Yorhel 2009-04-19 12:43:25 +02:00
parent ba4d06e09e
commit d8058362ec
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/delete.c
View file

@ -184,7 +184,7 @@ int delete_key(int ch) {
}
struct dir *delete_dir(struct dir *dr) {
int delete_dir(struct dir *dr) {
struct dir *nxt, *cur;
int r;
char file[PATH_MAX];
@ -196,8 +196,8 @@ struct dir *delete_dir(struct dir *dr) {
/* check for input or screen resizes */
strcpy(curfile, file);
if(input_handle(1))
return root;
if(input_handle(0))
return 1;
/* do the actual deleting */
if(dr->flags & FF_DIR) {
@ -206,8 +206,8 @@ struct dir *delete_dir(struct dir *dr) {
while(nxt != NULL) {
cur = nxt;
nxt = cur->next;
if(delete_dir(cur) == root)
return root;
if(delete_dir(cur))
return 1;
}
}
r = rmdir(file);
@ -220,14 +220,16 @@ struct dir *delete_dir(struct dir *dr) {
lasterrno = errno;
while(state == DS_FAILED)
if(input_handle(0))
return root;
return 1;
}
return freedir(dr);
freedir(dr);
return 0;
}
void delete_process() {
struct dir *n = root->parent;
/* confirm */
seloption = 1;
while(state == DS_CONFIRM && !noconfirm)
@ -237,7 +239,10 @@ void delete_process() {
/* delete */
lastupdate = 999;
seloption = 0;
return browse_init(delete_dir(root));
if(delete_dir(root))
browse_init(root);
else
browse_init(n);
}