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

Notify invalid keypress at bookmark and plugin key input

Browse source
This commit is contained in:
Arun Prakash Jana 2019-12-17 07:13:50 +05:30
parent 99128ab5c9
commit 8d3c24d19f
No known key found for this signature in database
GPG key ID: A75979F35C080412
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/nnn.c
View file

@ -421,7 +421,7 @@ static char * const utils[] = {
/* Common strings */ /* Common strings */
#define MSG_NO_TRAVERSAL 0 #define MSG_NO_TRAVERSAL 0
#define MSG_INVBM_KEY 1 #define MSG_INVALID_KEY 1
#define STR_TMPFILE 2 #define STR_TMPFILE 2
#define MSG_0_SELECTED 3 #define MSG_0_SELECTED 3
#define MSG_UTIL_MISSING 4 #define MSG_UTIL_MISSING 4
@ -3434,7 +3434,7 @@ static void printkv(kv *kvarr, FILE *fp, uchar max)
fprintf(fp, " %c: %s\n", (char)kvarr[i].key, kvarr[i].val); fprintf(fp, " %c: %s\n", (char)kvarr[i].key, kvarr[i].val);
} }
static void sprintkeys(kv *kvarr, char *buf, uchar max) static void printkeys(kv *kvarr, char *buf, uchar max)
{ {
uchar i = 0; uchar i = 0;
uchar j = 0; uchar j = 0;
@ -4574,7 +4574,7 @@ nochange:
break; break;
default: default:
xstrlcpy(g_buf, messages[MSG_BOOKMARK_KEYS], CMD_LEN_MAX); xstrlcpy(g_buf, messages[MSG_BOOKMARK_KEYS], CMD_LEN_MAX);
sprintkeys(bookmark, g_buf + strlen(g_buf), BM_MAX); printkeys(bookmark, g_buf + strlen(g_buf), BM_MAX);
printprompt(g_buf); printprompt(g_buf);
fd = get_input(NULL); fd = get_input(NULL);
} }
@ -4636,7 +4636,7 @@ nochange:
} }
if (!get_kv_val(bookmark, newpath, fd, BM_MAX, TRUE)) { if (!get_kv_val(bookmark, newpath, fd, BM_MAX, TRUE)) {
clearprompt(); printwait(messages[MSG_INVALID_KEY], &presel);;
goto nochange; goto nochange;
} }
@ -5205,12 +5205,12 @@ nochange:
if (sel == SEL_PLUGKEY) { if (sel == SEL_PLUGKEY) {
xstrlcpy(g_buf, messages[MSG_PLUGIN_KEYS], CMD_LEN_MAX); xstrlcpy(g_buf, messages[MSG_PLUGIN_KEYS], CMD_LEN_MAX);
sprintkeys(plug, g_buf + strlen(g_buf), PLUGIN_MAX); printkeys(plug, g_buf + strlen(g_buf), PLUGIN_MAX);
printprompt(g_buf); printprompt(g_buf);
r = get_input(NULL); r = get_input(NULL);
tmp = get_kv_val(plug, NULL, r, PLUGIN_MAX, FALSE); tmp = get_kv_val(plug, NULL, r, PLUGIN_MAX, FALSE);
if (!tmp) { if (!tmp) {
clearprompt(); printwait(messages[MSG_INVALID_KEY], &presel);
goto nochange; goto nochange;
} }
@ -5741,7 +5741,7 @@ int main(int argc, char *argv[])
initpath = get_kv_val(bookmark, NULL, *arg, BM_MAX, TRUE); initpath = get_kv_val(bookmark, NULL, *arg, BM_MAX, TRUE);
if (!initpath) { if (!initpath) {
fprintf(stderr, "%s\n", messages[MSG_INVBM_KEY]); fprintf(stderr, "%s\n", messages[MSG_INVALID_KEY]);
return _FAILURE; return _FAILURE;
} }
} else if (argc == optind) { } else if (argc == optind) {