mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2024-11-28 13:51:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Macro for confirmation

Browse source
This commit is contained in:
Arun Prakash Jana 2020-02-22 04:18:15 +05:30
parent ca257e6016
commit b816a90256
No known key found for this signature in database
GPG key ID: A75979F35C080412
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/nnn.c
View file

@ -645,6 +645,7 @@ static haiku_nm_h haiku_hnd;
/* A faster version of xisdigit */ /* A faster version of xisdigit */
#define xisdigit(c) ((unsigned int) (c) - '0' <= 9) #define xisdigit(c) ((unsigned int) (c) - '0' <= 9)
#define xerror() perror(xitoa(__LINE__)) #define xerror() perror(xitoa(__LINE__))
#define xconfirm(c) (c == 'y' || c == 'Y')
#ifdef __GNUC__ #ifdef __GNUC__
#define UNUSED(x) UNUSED_##x __attribute__((__unused__)) #define UNUSED(x) UNUSED_##x __attribute__((__unused__))
@ -799,7 +800,7 @@ static char confirm_force(bool selection)
(selection ? xitoa(nselected) : "current"), (selection ? "(s)" : "")); (selection ? xitoa(nselected) : "current"), (selection ? "(s)" : ""));
r = get_input(str); r = get_input(str);
if (r == 'y' || r == 'Y') if (xconfirm(r))
return 'f'; /* forceful */ return 'f'; /* forceful */
return 'i'; /* interactive */ return 'i'; /* interactive */
} }
@ -3869,7 +3870,7 @@ static bool unmount(char *name, char *newpath, int *presel, char *currentpath)
#endif #endif
int r = get_input(messages[MSG_LAZY]); int r = get_input(messages[MSG_LAZY]);
if (r != 'y' && r != 'Y') if (!xconfirm(r))
return FALSE; return FALSE;
#ifdef __APPLE__ #ifdef __APPLE__
@ -4553,7 +4554,7 @@ static int handle_context_switch(enum action sel, char *newpath)
(r == CTX_MAX - 1) ? (r = 0) : ++r; (r == CTX_MAX - 1) ? (r = 0) : ++r;
snprintf(newpath, PATH_MAX, messages[MSG_CREATE_CTX], r + 1); snprintf(newpath, PATH_MAX, messages[MSG_CREATE_CTX], r + 1);
input = get_input(newpath); input = get_input(newpath);
if (input != 'y' && input != 'Y') if (!xconfirm(input))
return -1; return -1;
} }
@ -5727,7 +5728,7 @@ nochange:
mkpath(path, tmp, newpath); mkpath(path, tmp, newpath);
if (access(newpath, F_OK) == 0) { if (access(newpath, F_OK) == 0) {
fd = get_input(messages[MSG_OVERWRITE]); fd = get_input(messages[MSG_OVERWRITE]);
if (fd != 'y' && fd != 'Y') { if (!xconfirm(fd)) {
statusbar(path); statusbar(path);
goto nochange; goto nochange;
} }
@ -5785,7 +5786,7 @@ nochange:
if (sel == SEL_RENAME) { if (sel == SEL_RENAME) {
/* Overwrite file with same name? */ /* Overwrite file with same name? */
r = get_input(messages[MSG_OVERWRITE]); r = get_input(messages[MSG_OVERWRITE]);
if (r != 'y' && r != 'Y') { if (!xconfirm(r)) {
close(fd); close(fd);
break; break;
} }
@ -6037,7 +6038,7 @@ nochange:
break; break;
} }
if (!(r == CTX_MAX || r == 'y' || r == 'Y')) if (!(r == CTX_MAX || xconfirm(r)))
break; // fallthrough break; // fallthrough
} }