Fix regression with opening binary file

This commit is contained in:
Arun Prakash Jana 2019-05-08 23:17:35 +05:30
parent 3e54217ae9
commit b093d98a6e
No known key found for this signature in database
GPG Key ID: A75979F35C080412
1 changed files with 4 additions and 21 deletions

View File

@ -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);