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

Convert keys to int

Browse source
This commit is contained in:
Arun Prakash Jana 2018-11-12 23:29:29 +05:30
parent 48e64c2a79
commit d9ff3a3588
No known key found for this signature in database
GPG key ID: A75979F35C080412
1 changed files with 13 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/nnn.c
View file

@ -236,7 +236,7 @@ typedef struct entry {
/* Bookmark */ /* Bookmark */
typedef struct { typedef struct {
char *key; int key;
char *loc; char *loc;
} bm; } bm;
@ -1368,31 +1368,19 @@ static int parsebmstr()
return 0; return 0;
while (*bms && i < BM_MAX) { while (*bms && i < BM_MAX) {
bookmark[i].key = bms; bookmark[i].key = *bms;
++bms; if (!*++bms) {
while (*bms && *bms != ':') { bookmark[i].key = '\0';
++bms;
/*
* Use single-char keys to combine with Leader key.
* Fail here to ensure keys are single char.
* To support multiple char keys remove the return
* and add appropriate check to enable smart-detect.
*/
return -1;
}
if (!*bms) {
bookmark[i].key = NULL;
break; break;
} }
*bms = '\0'; if (*bms != ':')
return -1; /* We support single char keys only */
bookmark[i].loc = ++bms; bookmark[i].loc = ++bms;
if (bookmark[i].loc[0] == '\0' || bookmark[i].loc[0] == ';') { if (bookmark[i].loc[0] == '\0' || bookmark[i].loc[0] == ';') {
bookmark[i].key = NULL; bookmark[i].key = '\0';
break; break;
} }
@ -1417,15 +1405,12 @@ static int parsebmstr()
* NULL is returned in case of no match, path resolution failure etc. * NULL is returned in case of no match, path resolution failure etc.
* buf would be modified, so check return value before access * buf would be modified, so check return value before access
*/ */
static char *get_bm_loc(char *key, char *buf) static char *get_bm_loc(int key, char *buf)
{ {
int r; int r;
if (!key || !key[0])
return NULL;
for (r = 0; bookmark[r].key && r < BM_MAX; ++r) { for (r = 0; bookmark[r].key && r < BM_MAX; ++r) {
if (strcmp(bookmark[r].key, key) == 0) { if (bookmark[r].key == key) {
if (bookmark[r].loc[0] == '~') { if (bookmark[r].loc[0] == '~') {
char *home = getenv("HOME"); char *home = getenv("HOME");
@ -2026,7 +2011,7 @@ static int show_help(char *path)
dprintf(fd, "BOOKMARKS\n"); dprintf(fd, "BOOKMARKS\n");
for (; i < BM_MAX; ++i) for (; i < BM_MAX; ++i)
if (bookmark[i].key) if (bookmark[i].key)
dprintf(fd, " %s: %s\n", bookmark[i].key, bookmark[i].loc); dprintf(fd, " %c: %s\n", (char)bookmark[i].key, bookmark[i].loc);
else else
break; break;
dprintf(fd, "\n"); dprintf(fd, "\n");
@ -2728,7 +2713,7 @@ nochange:
case '~': //fallthrough case '~': //fallthrough
case '-': //fallthrough case '-': //fallthrough
case '&': case '&':
presel = (char)fd; presel = fd;
goto nochange; goto nochange;
case '>': case '>':
case '.': case '.':
@ -2782,7 +2767,7 @@ nochange:
goto begin; goto begin;
} }
if (get_bm_loc((char)fd, newpath) == NULL) { if (get_bm_loc(fd, newpath) == NULL) {
printmsg(messages[STR_INVBM_KEY]); printmsg(messages[STR_INVBM_KEY]);
goto nochange; goto nochange;
} }
@ -3461,7 +3446,7 @@ int main(int argc, char *argv[])
} }
if (ipath) { /* Open a bookmark directly */ if (ipath) { /* Open a bookmark directly */
if (get_bm_loc(ipath, cwd) == NULL) { if (ipath[1] || get_bm_loc(*ipath, cwd) == NULL) {
fprintf(stderr, "%s\n", messages[STR_INVBM_KEY]); fprintf(stderr, "%s\n", messages[STR_INVBM_KEY]);
exit(1); exit(1);
} }