From 6709ac01ad73fbf6e9f0fb313986a11cbf49fbfe Mon Sep 17 00:00:00 2001 From: Arun Prakash Jana Date: Thu, 7 Mar 2019 21:14:43 +0530 Subject: [PATCH] Code reformat --- src/nnn.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/nnn.c b/src/nnn.c index 515aa467..58109134 100644 --- a/src/nnn.c +++ b/src/nnn.c @@ -4166,9 +4166,6 @@ int main(int argc, char *argv[]) idletimeout = xatoi(getenv(env_cfg[NNN_IDLE_TIMEOUT])); DPRINTF_U(idletimeout); - /* Get the clipboard copier, if set */ - copier = getenv(env_cfg[NNN_COPIER]); - home = getenv("HOME"); DPRINTF_S(home); @@ -4188,19 +4185,22 @@ int main(int argc, char *argv[]) cfg.trash = 1; } - if (home) { - /* Prefix for other temporary ops */ + /* Prefix for other temporary ops */ + if (home) g_tmpfplen = xstrlcpy(g_tmpfpath, home, HOME_LEN_MAX); - } else if (getenv("TMPDIR")) - g_tmpfplen = xstrlcpy(g_tmpfpath, getenv("TMPDIR"), HOME_LEN_MAX); else if (xdiraccess("/tmp")) g_tmpfplen = xstrlcpy(g_tmpfpath, "/tmp", HOME_LEN_MAX); + else if ((copier = getenv("TMPDIR")) != NULL) + g_tmpfplen = xstrlcpy(g_tmpfpath, copier, HOME_LEN_MAX); if (!cfg.picker && g_tmpfplen) { xstrlcpy(g_cppath, g_tmpfpath, PATH_MAX); xstrlcpy(g_cppath + g_tmpfplen - 1, "/.nnncp", PATH_MAX - g_tmpfplen); } + /* Get the clipboard copier, if set */ + copier = getenv(env_cfg[NNN_COPIER]); + /* Disable auto-select if opted */ if (getenv(env_cfg[NNN_NO_AUTOSELECT])) cfg.autoselect = 0;