瀏覽代碼

Try fallbak for missing apps, use popen wrapper

master
Arun Prakash Jana 7 年之前
父節點
當前提交
205dd6db05
沒有發現已知的金鑰在資料庫的簽署中 GPG Key ID: A75979F35C080412
共有 1 個文件被更改,包括 6 次插入8 次删除
  1. +6
    -8
      nnn.c

+ 6
- 8
nnn.c 查看文件

@@ -1141,7 +1141,6 @@ nochange:
static char cmd[MAX_CMD_LEN];
static char *runvi = "vi";
static int status;
static FILE *fp;

/* If default mime opener is set, use it */
if (opener) {
@@ -1155,20 +1154,19 @@ nochange:
/* Try custom applications */
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 a custom handler application is
not set, open plain text files with
vi, then try fallback_opener */
snprintf(cmd, MAX_CMD_LEN,
"file \"%s\"", newpath);
fp = popen(cmd, "r");
if (fp == NULL)
goto nochange;
if (fgets(cmd, MAX_CMD_LEN, fp) == NULL) {
pclose(fp);
if (get_output(cmd, MAX_CMD_LEN) == NULL)
goto nochange;
}
pclose(fp);

if (strstr(cmd, "ASCII text") != NULL)
bin = runvi;


Loading…
取消
儲存