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

Revert "Use a fixed key , for pinning dir"

Browse source 
This reverts commit 4d17b82950.
This commit is contained in:
Arun Prakash Jana 2019-12-25 22:17:50 +05:30
parent 4d17b82950
commit 541bc3f653
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/nnn.c
View file

@ -327,7 +327,7 @@ static struct entry *dents;
static blkcnt_t ent_blocks; static blkcnt_t ent_blocks;
static blkcnt_t dir_blocks; static blkcnt_t dir_blocks;
static ulong num_files; static ulong num_files;
static kv bookmark[BM_MAX + 1]; static kv bookmark[BM_MAX];
static kv plug[PLUGIN_MAX]; static kv plug[PLUGIN_MAX];
static uchar g_tmpfplen; static uchar g_tmpfplen;
static uchar blk_shift = BLK_SHIFT_512; static uchar blk_shift = BLK_SHIFT_512;
@ -4215,6 +4215,7 @@ static void redraw(char *path)
static void browse(char *ipath, const char *session) static void browse(char *ipath, const char *session)
{ {
char newpath[PATH_MAX] __attribute__ ((aligned)); char newpath[PATH_MAX] __attribute__ ((aligned));
char mark[PATH_MAX] __attribute__ ((aligned));
char rundir[PATH_MAX] __attribute__ ((aligned)); char rundir[PATH_MAX] __attribute__ ((aligned));
char runfile[NAME_MAX + 1] __attribute__ ((aligned)); char runfile[NAME_MAX + 1] __attribute__ ((aligned));
char *path, *lastdir, *lastname, *dir, *tmp; char *path, *lastdir, *lastname, *dir, *tmp;
@ -4243,7 +4244,7 @@ static void browse(char *ipath, const char *session)
g_ctx[0].c_cfg = cfg; /* current configuration */ g_ctx[0].c_cfg = cfg; /* current configuration */
} }
newpath[0] = rundir[0] = runfile[0] = '\0'; newpath[0] = rundir[0] = runfile[0] = mark[0] = '\0';
presel = cfg.filtermode ? FILTER : 0; presel = cfg.filtermode ? FILTER : 0;
@ -4636,14 +4637,16 @@ nochange:
r = get_input(NULL); r = get_input(NULL);
if (!get_kv_val(bookmark, newpath, r, BM_MAX, TRUE)) { if (!get_kv_val(bookmark, newpath, r, BM_MAX, TRUE)) {
if (r == ',' && bookmark[BM_MAX].val) if (r == ',' && mark[0])
xstrlcpy(newpath, bookmark[BM_MAX].val, PATH_MAX); xstrlcpy(newpath, mark, PATH_MAX);
else { else {
printwait(messages[MSG_INVALID_KEY], &presel);; printwait(messages[MSG_INVALID_KEY], &presel);;
goto nochange; goto nochange;
} }
} }
if (!xdiraccess(newpath)) { if (!xdiraccess(newpath)) {
printwait(messages[MSG_ACCESS], &presel); printwait(messages[MSG_ACCESS], &presel);
goto nochange; goto nochange;
@ -4664,9 +4667,8 @@ nochange:
setdirwatch(); setdirwatch();
goto begin; goto begin;
case SEL_PIN: case SEL_PIN:
bookmark[BM_MAX].val = xrealloc(bookmark[BM_MAX].val, strlen(path)); xstrlcpy(mark, path, PATH_MAX);
xstrlcpy(bookmark[BM_MAX].val, path, PATH_MAX); printwait(mark, &presel);
printwait(bookmark[BM_MAX].val, &presel);
goto nochange; goto nochange;
case SEL_FLTR: case SEL_FLTR:
/* Unwatch dir if we are still in a filtered view */ /* Unwatch dir if we are still in a filtered view */
@ -5601,7 +5603,6 @@ static void cleanup(void)
free(cfgdir); free(cfgdir);
free(initpath); free(initpath);
free(bmstr); free(bmstr);
free(bookmark[BM_MAX].val);
free(pluginstr); free(pluginstr);
unlink(g_pipepath); unlink(g_pipepath);
@ -5741,7 +5742,6 @@ int main(int argc, char *argv[])
fprintf(stderr, "%s\n", env_cfg[NNN_BMS]); fprintf(stderr, "%s\n", env_cfg[NNN_BMS]);
return _FAILURE; return _FAILURE;
} }
bookmark[BM_MAX].key = ','; /* Set key for pinned dir */
/* Parse plugins string */ /* Parse plugins string */
if (!parsekvpair(plug, &pluginstr, "NNN_PLUG", PLUGIN_MAX)) { if (!parsekvpair(plug, &pluginstr, "NNN_PLUG", PLUGIN_MAX)) {