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

Use global for HOME

Browse source
This commit is contained in:
Arun Prakash Jana 2019-01-24 21:45:02 +05:30
parent 5e5ca2fc95
commit 223045fc99
No known key found for this signature in database
GPG key ID: A75979F35C080412
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/nnn.c
View file

@ -307,6 +307,7 @@ static char *editor;
static char *pager, *pager_arg; static char *pager, *pager_arg;
static char *shell, *shell_arg; static char *shell, *shell_arg;
static char *scriptpath; static char *scriptpath;
static char *home;
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;
@ -1682,8 +1683,6 @@ static char *get_bm_loc(int key, char *buf)
for (r = 0; bookmark[r].key && r < BM_MAX; ++r) { for (r = 0; bookmark[r].key && r < BM_MAX; ++r) {
if (bookmark[r].key == key) { if (bookmark[r].key == key) {
if (bookmark[r].loc[0] == '~') { if (bookmark[r].loc[0] == '~') {
char *home = getenv("HOME");
if (!home) { if (!home) {
DPRINTF_S(messages[STR_NOHOME_ID]); DPRINTF_S(messages[STR_NOHOME_ID]);
return NULL; return NULL;
@ -3004,7 +3003,10 @@ nochange:
case SEL_VISIT: case SEL_VISIT:
switch (sel) { switch (sel) {
case SEL_CDHOME: case SEL_CDHOME:
dir = xgetenv("HOME", path); if (home)
dir = home;
else
dir = path;
break; break;
case SEL_CDBEGIN: case SEL_CDBEGIN:
dir = ipath; dir = ipath;
@ -3981,8 +3983,9 @@ int main(int argc, char *argv[])
/* Get the clipboard copier, if set */ /* Get the clipboard copier, if set */
copier = getenv(env_cfg[NNN_COPIER]); copier = getenv(env_cfg[NNN_COPIER]);
if (getenv("HOME")) home = getenv("HOME");
g_tmpfplen = xstrlcpy(g_tmpfpath, getenv("HOME"), HOME_LEN_MAX); if (home)
g_tmpfplen = xstrlcpy(g_tmpfpath, home, HOME_LEN_MAX);
else if (getenv("TMPDIR")) else if (getenv("TMPDIR"))
g_tmpfplen = xstrlcpy(g_tmpfpath, getenv("TMPDIR"), HOME_LEN_MAX); g_tmpfplen = xstrlcpy(g_tmpfpath, getenv("TMPDIR"), HOME_LEN_MAX);
else if (xdiraccess("/tmp")) else if (xdiraccess("/tmp"))