From 399ccdeb47b9ec659a3137fbe4270cf6d273730b Mon Sep 17 00:00:00 2001 From: Yorhel <git@yorhel.nl> Date: Sat, 18 Aug 2012 09:21:33 +0200 Subject: [PATCH] calc.c: Fix path display when scanning an empty directory http://dev.yorhel.nl/ncdu/bug/15 --- src/calc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/calc.c b/src/calc.c index 07cf9a3..bef226e 100644 --- a/src/calc.c +++ b/src/calc.c @@ -458,11 +458,6 @@ int calc_process() { /* calculate */ n = calc_dir(root, name); - /* free some resources */ - if(!path[1] && strcmp(name, ".")) - free(name); - free(path); - if(links) { kh_destroy(hl, links); links = NULL; @@ -473,6 +468,7 @@ int calc_process() { if(root->sub == NULL) { freedir(root); failed = 1; + calc_enterpath(name); strcpy(errmsg, "Directory empty."); goto calc_fail; } @@ -498,6 +494,10 @@ int calc_process() { /* something went wrong... */ freedir(root); calc_fail: + if(!path[1] && strcmp(name, ".")) + free(name); + free(path); + while(failed && !input_handle(0)) ; if(orig == NULL) -- GitLab