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

Properly call calc_leavepath() on error

Browse source
This commit is contained in:
Yorhel 2009-04-26 12:58:22 +02:00
parent 796d043c0d
commit 9cc79b0fab
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/calc.c
View file

@ -169,6 +169,7 @@ int calc_dir(struct dir *dest, char *name) {
t = dest; t = dest;
while((t = t->parent) != NULL) while((t = t->parent) != NULL)
t->flags |= FF_SERR; t->flags |= FF_SERR;
calc_leavepath();
return 0; return 0;
} }
@ -177,8 +178,10 @@ int calc_dir(struct dir *dest, char *name) {
calc_enterpath(dr->d_name); calc_enterpath(dr->d_name);
if(calc_item(dest, dr->d_name)) if(calc_item(dest, dr->d_name))
dest->flags |= FF_ERR; dest->flags |= FF_ERR;
if(input_handle(1)) if(input_handle(1)) {
calc_leavepath();
return 1; return 1;
}
calc_leavepath(); calc_leavepath();
errno = 0; errno = 0;
} }
@ -203,13 +206,16 @@ int calc_dir(struct dir *dest, char *name) {
ch = 0; ch = 0;
for(t=dest->sub; t!=NULL; t=t->next) for(t=dest->sub; t!=NULL; t=t->next)
if(t->flags & FF_DIR && !(t->flags & FF_EXL || t->flags & FF_OTHFS)) if(t->flags & FF_DIR && !(t->flags & FF_EXL || t->flags & FF_OTHFS))
if(calc_dir(t, t->name)) if(calc_dir(t, t->name)) {
calc_leavepath();
return 1; return 1;
}
/* chdir back */ /* chdir back */
if(chdir("..") < 0) { if(chdir("..") < 0) {
failed = 1; failed = 1;
strcpy(errmsg, "Couldn't chdir to previous directory"); strcpy(errmsg, "Couldn't chdir to previous directory");
calc_leavepath();
return 1; return 1;
} }
calc_leavepath(); calc_leavepath();