mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2024-11-28 05:41:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Try fallbak for missing apps, use popen wrapper

Browse source
This commit is contained in:
Arun Prakash Jana 2017-04-05 22:18:21 +05:30
parent b7e4968a48
commit 205dd6db05
No known key found for this signature in database
GPG key ID: A75979F35C080412
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
nnn.c
View file

@ -1141,7 +1141,6 @@ nochange:
static char cmd[MAX_CMD_LEN]; static char cmd[MAX_CMD_LEN];
static char *runvi = "vi"; static char *runvi = "vi";
static int status; static int status;
static FILE *fp;
/* If default mime opener is set, use it */ /* If default mime opener is set, use it */
if (opener) { if (opener) {
@ -1155,20 +1154,19 @@ nochange:
/* Try custom applications */ /* Try custom applications */
bin = openwith(newpath); bin = openwith(newpath);
/* If custom app doesn't exist try fallback */
snprintf(cmd, MAX_CMD_LEN, "which \"%s\"", bin);
if (get_output(cmd, MAX_CMD_LEN) == NULL)
bin = NULL;
if (bin == NULL) { if (bin == NULL) {
/* If a custom handler application is /* If a custom handler application is
not set, open plain text files with not set, open plain text files with
vi, then try fallback_opener */ vi, then try fallback_opener */
snprintf(cmd, MAX_CMD_LEN, snprintf(cmd, MAX_CMD_LEN,
"file \"%s\"", newpath); "file \"%s\"", newpath);
fp = popen(cmd, "r"); if (get_output(cmd, MAX_CMD_LEN) == NULL)
if (fp == NULL)
goto nochange; goto nochange;
if (fgets(cmd, MAX_CMD_LEN, fp) == NULL) {
pclose(fp);
goto nochange;
}
pclose(fp);
if (strstr(cmd, "ASCII text") != NULL) if (strstr(cmd, "ASCII text") != NULL)
bin = runvi; bin = runvi;