picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

coredumpctl: fix --debugger option

Browse source 
Closes #12660.
This commit is contained in:
Yu Watanabe 2019-05-28 10:52:55 +09:00 committed by Zbigniew Jędrzejewski-Szmek
parent d0533a319b
commit 3f0d8b2dbd
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/coredump/coredumpctl.c
View file

@ -904,7 +904,7 @@ static int dump_core(int argc, char **argv, void *userdata) {
static int run_debug(int argc, char **argv, void *userdata) {
_cleanup_(sd_journal_closep) sd_journal *j = NULL;
_cleanup_free_ char *exe = NULL, *path = NULL;
_cleanup_free_ char *exe = NULL, *path = NULL, *debugger = NULL;
bool unlink_path = false;
const char *data, *fork_name;
size_t len;
@ -921,6 +921,10 @@ static int run_debug(int argc, char **argv, void *userdata) {
arg_debugger = "gdb";
}
debugger = strdup(arg_debugger);
if (!debugger)
return -ENOMEM;
if (arg_field) {
log_error("Option --field/-F only makes sense with list");
return -EINVAL;
@ -966,19 +970,19 @@ static int run_debug(int argc, char **argv, void *userdata) {
/* Don't interfere with gdb and its handling of SIGINT. */
(void) ignore_signals(SIGINT, -1);
fork_name = strjoina("(", arg_debugger, ")");
fork_name = strjoina("(", debugger, ")");
r = safe_fork(fork_name, FORK_RESET_SIGNALS|FORK_DEATHSIG|FORK_CLOSE_ALL_FDS|FORK_RLIMIT_NOFILE_SAFE|FORK_LOG, &pid);
if (r < 0)
goto finish;
if (r == 0) {
execlp(arg_debugger, arg_debugger, exe, "-c", path, NULL);
execlp(debugger, debugger, exe, "-c", path, NULL);
log_open();
log_error_errno(errno, "Failed to invoke %s: %m", arg_debugger);
log_error_errno(errno, "Failed to invoke %s: %m", debugger);
_exit(EXIT_FAILURE);
}
r = wait_for_terminate_and_check(arg_debugger, pid, WAIT_LOG_ABNORMAL);
r = wait_for_terminate_and_check(debugger, pid, WAIT_LOG_ABNORMAL);
finish:
(void) default_signals(SIGINT, -1);