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

delete.c: Minor nitpicks

Browse source 
The ternary operator is awesome, makes DRY much easier.
"_clear" -> "clearing" is just a preference.
This commit is contained in:
Yorhel 2014-04-30 13:00:23 +02:00
parent 347cfde59a
commit 54d6d78d9d
1 changed files with 15 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/delete.c
View file

@ -37,22 +37,21 @@
static struct dir *root, *nextsel, *curdir; static struct dir *root, *nextsel, *curdir;
static char noconfirm = 0, ignoreerr = 0, state, seloption; static char noconfirm = 0, ignoreerr = 0, clearing, state, seloption;
static int lasterrno, _clear = 0; static int lasterrno;
static void delete_draw_confirm() { static void delete_draw_confirm() {
if(clearing) {
if (_clear) {
nccreate(6, 60, "Confirm clear"); nccreate(6, 60, "Confirm clear");
ncprint(1, 2, "Are you sure you want to clear \"%s\"%c", ncprint(1, 2, "Are you sure you want to clear \"%s\"?", cropstr(root->name, 21));
cropstr(root->name, 21), root->flags & FF_DIR ? ' ' : '?');
} else { } else {
int single = !(root->flags & FF_DIR) || root->sub == NULL;
nccreate(6, 60, "Confirm delete"); nccreate(6, 60, "Confirm delete");
ncprint(1, 2, "Are you sure you want to delete \"%s\"%c", ncprint(1, 2, "Are you sure you want to delete \"%s\"%c",
cropstr(root->name, 21), root->flags & FF_DIR ? ' ' : '?'); cropstr(root->name, 21), single ? '?' : ' ');
if(root->flags & FF_DIR) if(!single)
ncprint(2, 18, "and all of its contents?"); ncprint(2, 18, "and all of its contents?");
} }
@ -74,11 +73,7 @@ static void delete_draw_confirm() {
static void delete_draw_progress() { static void delete_draw_progress() {
if (_clear) nccreate(6, 60, clearing ? "Clearing..." : "Deleting...");
nccreate(6, 60, "Clearing...");
else
nccreate(6, 60, "Deleting...");
ncaddstr(1, 2, cropstr(getpath(curdir), 47)); ncaddstr(1, 2, cropstr(getpath(curdir), 47));
ncaddstr(4, 41, "Press q to abort"); ncaddstr(4, 41, "Press q to abort");
} }
@ -87,10 +82,9 @@ static void delete_draw_progress() {
static void delete_draw_error() { static void delete_draw_error() {
nccreate(6, 60, "Error!"); nccreate(6, 60, "Error!");
if (_clear && root == curdir) ncprint(1, 2,
ncprint(1, 2, "Can't clear %s:", cropstr(getpath(curdir), 42)); clearing && root == curdir ? "Can't clear %s:" : "Can't delete %s:",
else cropstr(getpath(curdir), 42));
ncprint(1, 2, "Can't delete %s:", cropstr(getpath(curdir), 42));
ncaddstr(2, 4, strerror(lasterrno)); ncaddstr(2, 4, strerror(lasterrno));
if(seloption == 0) if(seloption == 0)
@ -200,7 +194,7 @@ static int delete_dir(struct dir *dr) {
} }
if((r = chdir("..")) < 0) if((r = chdir("..")) < 0)
goto delete_nxt; goto delete_nxt;
r = dr->sub == NULL && (!_clear || dr != root) ? rmdir(dr->name) : 0; r = dr->sub == NULL && (!clearing || dr != root) ? rmdir(dr->name) : 0;
} else } else
r = unlink(dr->name); r = unlink(dr->name);
@ -214,7 +208,7 @@ delete_nxt:
if(input_handle(0)) if(input_handle(0))
return 1; return 1;
} else if( !(dr->flags & FF_DIR && dr->sub != NULL) } else if( !(dr->flags & FF_DIR && dr->sub != NULL)
&& (!_clear || root != dr)) { && (!clearing || root != dr)) {
freedir(dr); freedir(dr);
return 0; return 0;
} }
@ -249,7 +243,7 @@ void delete_process() {
delete_dir(root); delete_dir(root);
if(nextsel) if(nextsel)
nextsel->flags |= FF_BSEL; nextsel->flags |= FF_BSEL;
if (_clear) if(clearing)
browse_init(root); browse_init(root);
else else
browse_init(par); browse_init(par);
@ -263,6 +257,6 @@ void delete_init(struct dir *dr, struct dir *s, int clear) {
root = curdir = dr; root = curdir = dr;
pstate = ST_DEL; pstate = ST_DEL;
nextsel = s; nextsel = s;
_clear = clear; clearing = !!clear;
} }