nagbalae/dunst
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #482 from bebehei/execvp-errorhandler

Browse Source 
Handle execvp error in open_browser
This commit is contained in:
Nikos Tsipinakis 2018-01-15 17:30:27 +02:00 committed by GitHub
commit d25404d590
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/menu.c
View File

@ -115,10 +115,15 @@ void open_browser(const char *in)
if (browser_pid2) {
exit(0);
} else {
char *browser_cmd =
string_append(settings.browser, url, " ");
char *browser_cmd = g_strconcat(settings.browser, " ", url, NULL);
char **cmd = g_strsplit(browser_cmd, " ", 0);
execvp(cmd[0], cmd);
// execvp won't return if it's successful
// so, if we're here, it's definitely an error
fprintf(stderr, "Warning: failed to execute '%s': %s\n",
settings.browser,
strerror(errno));
exit(EXIT_FAILURE);
}
}
}
@ -238,6 +243,10 @@ void context_menu(void)
exit(EXIT_FAILURE);
}
execvp(settings.dmenu_cmd[0], settings.dmenu_cmd);
fprintf(stderr, "Warning: failed to execute '%s': %s\n",
settings.dmenu,
strerror(errno));
exit(EXIT_FAILURE);
} else {
close(child_io[0]);
close(parent_io[1]);