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

Show debug info under DPRINTF

Browse source
This commit is contained in:
Arun Prakash Jana 2019-01-24 22:09:41 +05:30
parent 14639239de
commit 7c223758ac
No known key found for this signature in database
GPG key ID: A75979F35C080412
1 changed files with 12 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/nnn.c
View file

@ -442,15 +442,13 @@ static const char * const env_cfg[] = {
}; };
/* Required env vars */ /* Required env vars */
#define PWD 0 #define SHELL 0
#define SHELL 1 #define SHLVL 1
#define SHLVL 2 #define VISUAL 2
#define VISUAL 3 #define EDITOR 3
#define EDITOR 4 #define PAGER 4
#define PAGER 5
static const char * const envs[] = { static const char * const envs[] = {
"PWD",
"SHELL", "SHELL",
"SHLVL", "SHLVL",
"VISUAL", "VISUAL",
@ -2328,23 +2326,6 @@ static bool show_help(char *path)
dprintf(fd, "%s: 1\n", env_cfg[i]); dprintf(fd, "%s: 1\n", env_cfg[i]);
} }
dprintf(fd, "\n");
start = getenv(envs[PWD]);
if (start)
dprintf(fd, "%s: %s\n", envs[PWD], start);
if (getenv(envs[SHELL]))
dprintf(fd, "%s: %s %s\n", envs[SHELL], shell, shell_arg);
start = getenv(envs[SHLVL]);
if (start)
dprintf(fd, "%s: %s\n", envs[SHLVL], start);
if (getenv(envs[VISUAL]))
dprintf(fd, "%s: %s\n", envs[VISUAL], editor);
else if (getenv(envs[EDITOR]))
dprintf(fd, "%s: %s\n", envs[EDITOR], editor);
if (getenv(envs[PAGER]))
dprintf(fd, "%s: %s %s\n", envs[PAGER], pager, pager_arg);
dprintf(fd, "\nv%s\n%s\n", VERSION, GENERAL_INFO); dprintf(fd, "\nv%s\n%s\n", VERSION, GENERAL_INFO);
close(fd); close(fd);
@ -3943,14 +3924,21 @@ int main(int argc, char *argv[])
/* Get VISUAL/EDITOR */ /* Get VISUAL/EDITOR */
editor = xgetenv(envs[VISUAL], xgetenv(envs[EDITOR], "vi")); editor = xgetenv(envs[VISUAL], xgetenv(envs[EDITOR], "vi"));
DPRINTF_S(editor);
/* Get PAGER */ /* Get PAGER */
pager = xgetenv(envs[PAGER], "less"); pager = xgetenv(envs[PAGER], "less");
getprogarg(pager, &pager_arg); getprogarg(pager, &pager_arg);
DPRINTF_S(pager);
DPRINTF_S(pager_arg);
/* Get SHELL */ /* Get SHELL */
shell = xgetenv(envs[SHELL], "sh"); shell = xgetenv(envs[SHELL], "sh");
getprogarg(shell, &shell_arg); getprogarg(shell, &shell_arg);
DPRINTF_S(shell);
DPRINTF_S(shell_arg);
DPRINTF_S(getenv("PWD"));
/* Setup script execution */ /* Setup script execution */
scriptpath = getenv(env_cfg[NNN_SCRIPT]); scriptpath = getenv(env_cfg[NNN_SCRIPT]);