From b093d98a6e778aab99a52447bd7a011e14cc7d25 Mon Sep 17 00:00:00 2001 From: Arun Prakash Jana Date: Wed, 8 May 2019 23:17:35 +0530 Subject: [PATCH] Fix regression with opening binary file --- src/nnn.c | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/src/nnn.c b/src/nnn.c index 272aedad..f580159c 100644 --- a/src/nnn.c +++ b/src/nnn.c @@ -4359,10 +4359,6 @@ int main(int argc, char *argv[]) if (!setup_config()) return 1; - /* Get custom opener, if set */ - opener = xgetenv(env_cfg[NNN_OPENER], utils[OPENER]); - DPRINTF_S(opener); - /* Parse bookmarks string */ if (!parsebmstr()) { fprintf(stderr, "%s\n", env_cfg[NNN_BMS]); @@ -4390,23 +4386,6 @@ int main(int argc, char *argv[]) xerror(); return 1; } - - /* - * If nnn is set as the file manager, applications may try to open - * files by invoking nnn. In that case pass the file path to the - * desktop opener and exit. - */ - struct stat sb; - - if (stat(initpath, &sb) == -1) { - xerror(); - return 1; - } - - if (S_ISREG(sb.st_mode)) { - spawn(opener, initpath, NULL, NULL, F_NOTRACE | F_NOWAIT); - return 0; - } } /* Edit text in EDITOR, if opted */ @@ -4444,6 +4423,10 @@ int main(int argc, char *argv[]) } #endif + /* Get custom opener, if set */ + opener = xgetenv(env_cfg[NNN_OPENER], utils[OPENER]); + DPRINTF_S(opener); + /* Set nnn nesting level, idletimeout used as tmp var */ idletimeout = xatoi(getenv(env_cfg[NNNLVL])); setenv(env_cfg[NNNLVL], xitoa(++idletimeout), 1);