mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2025-01-09 17:39:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix NULL file name handling

Browse source
This commit is contained in:
Arun Prakash Jana 2021-08-25 00:47:52 +05:30
parent 900513710f
commit a62dbf093a
No known key found for this signature in database
GPG key ID: A75979F35C080412
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/nnn.c
View file

@ -4163,7 +4163,7 @@ static void savecurctx(char *path, char *curname, int nextctx)
context *ctxr = &g_ctx[nextctx]; context *ctxr = &g_ctx[nextctx];
/* Save current context */ /* Save current context */
if (ndents) if (curname)
xstrsncpy(g_ctx[tmpcfg.curctx].c_name, curname, NAME_MAX + 1); xstrsncpy(g_ctx[tmpcfg.curctx].c_name, curname, NAME_MAX + 1);
else else
g_ctx[tmpcfg.curctx].c_name[0] = '\0'; g_ctx[tmpcfg.curctx].c_name[0] = '\0';
@ -4345,7 +4345,8 @@ static void set_smart_ctx(int ctx, char *nextpath, char **path, char **lastname,
--ctx; --ctx;
/* Deactivate the new context and build from scratch */ /* Deactivate the new context and build from scratch */
g_ctx[ctx].c_cfg.ctxactive = 0; g_ctx[ctx].c_cfg.ctxactive = 0;
savecurctx(nextpath, pdents[cur].name, ctx); DPRINTF_S(nextpath);
savecurctx(nextpath, ndents ? pdents[cur].name : NULL, ctx);
*path = g_ctx[ctx].c_path; *path = g_ctx[ctx].c_path;
*lastdir = g_ctx[ctx].c_last; *lastdir = g_ctx[ctx].c_last;
*lastname = g_ctx[ctx].c_name; *lastname = g_ctx[ctx].c_name;
@ -6589,7 +6590,7 @@ nochange:
if (r >= CTX_MAX) if (r >= CTX_MAX)
sel = SEL_BACK; sel = SEL_BACK;
else if (r >= 0 && r != cfg.curctx) { else if (r >= 0 && r != cfg.curctx) {
savecurctx(path, pdents[cur].name, r); savecurctx(path, ndents ? pdents[cur].name : NULL, r);
/* Reset the pointers */ /* Reset the pointers */
path = g_ctx[r].c_path; path = g_ctx[r].c_path;
@ -6970,7 +6971,7 @@ nochange:
r = handle_context_switch(sel); r = handle_context_switch(sel);
if (r < 0) if (r < 0)
continue; continue;
savecurctx(path, pdents[cur].name, r); savecurctx(path, ndents ? pdents[cur].name : NULL, r);
/* Reset the pointers */ /* Reset the pointers */
path = g_ctx[r].c_path; path = g_ctx[r].c_path;