aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGravatar Arun Prakash Jana <engineerarun@gmail.com>2020-05-24 09:28:29 +0530
committerGravatar Arun Prakash Jana <engineerarun@gmail.com>2020-05-24 09:28:29 +0530
commit38829e561015b75ec9d748cd5965d4ddd011c0f2 (patch)
tree67f54046cb040f7dd876c33c98694ff9e917b90d /src
parent56886922a62b39b43897988bdae289a47fc1026a (diff)
downloadnnn-38829e561015b75ec9d748cd5965d4ddd011c0f2.tar.gz
Fix build break
Diffstat (limited to 'src')
-rw-r--r--src/nnn.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/src/nnn.c b/src/nnn.c
index c83d970..e9827fe 100644
--- a/src/nnn.c
+++ b/src/nnn.c
@@ -349,6 +349,7 @@ static char *prefixpath;
static char *plugindir;
static char *sessiondir;
static char *pnamebuf, *pselbuf;
+static char *mark;
#ifndef NOFIFO
static char *fifopath;
#endif
@@ -4430,6 +4431,7 @@ static void dentfree(void)
{
free(pnamebuf);
free(dents);
+ free(mark);
}
static blkcnt_t dirwalk(char *path, struct stat *psb)
@@ -5228,7 +5230,7 @@ static bool browse(char *ipath, const char *session, int pkey)
char newpath[PATH_MAX] __attribute__ ((aligned));
char rundir[PATH_MAX] __attribute__ ((aligned));
char runfile[NAME_MAX + 1] __attribute__ ((aligned));
- char *path, *lastdir, *lastname, *dir, *tmp, *mark = NULL;
+ char *path, *lastdir, *lastname, *dir, *tmp;
enum action sel;
struct stat sb;
int r = -1, presel, selstartid = 0, selendid = 0;
@@ -5352,20 +5354,16 @@ begin:
nochange:
/* Exit if parent has exited */
- if (getppid() == 1) {
- free(mark);
+ if (getppid() == 1)
_exit(EXIT_FAILURE);
- }
/* If CWD is deleted or moved or perms changed, find an accessible parent */
if (chdir(path) == -1)
goto begin;
/* If STDIN is no longer a tty (closed) we should exit */
- if (!isatty(STDIN_FILENO) && !cfg.picker) {
- free(mark);
+ if (!isatty(STDIN_FILENO) && !cfg.picker)
return EXIT_FAILURE;
- }
sel = nextsel(presel);
if (presel)
@@ -5533,7 +5531,6 @@ nochange:
if (cfg.picker && sel == SEL_GOIN) {
appendfpath(newpath, mkpath(path, dents[cur].name, newpath));
writesel(pselbuf, selbufpos - 1);
- free(mark);
return EXIT_SUCCESS;
}
@@ -6473,7 +6470,6 @@ nochange:
/* Picker mode: reset buffer or clear file */
if (sel == SEL_QUITCD || getenv("NNN_TMPFILE"))
cfg.picker ? selbufpos = 0 : write_lastdir(path);
- free(mark);
return sel == SEL_QUITFAIL ? EXIT_FAILURE : EXIT_SUCCESS;
default:
r = FALSE;