github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-22 22:36:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix 3rd arg to PROCESS_EXIT event for %self

Browse Source 
The PROCESS_EXIT event takes 3 args: event name, pid, status. However,
when fish is exiting, the PROCESS_EXIT is instead given the status of
whether the last commandline parsed successfully. Change it to use the
same value that fish itself is going to exit with.
This commit is contained in:
Kevin Ballard 2014-10-27 17:23:08 -07:00
parent ec5f3d0cc8
commit 6044ac7e5e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fish.cpp
View File

@ -523,7 +523,9 @@ int main(int argc, char **argv)
}
}
proc_fire_event(L"PROCESS_EXIT", EVENT_EXIT, getpid(), res);
int exit_status = res ? STATUS_UNKNOWN_COMMAND : proc_get_last_status();
proc_fire_event(L"PROCESS_EXIT", EVENT_EXIT, getpid(), exit_status);
restore_term_mode();
restore_term_foreground_process_group();
@ -543,6 +545,6 @@ int main(int argc, char **argv)
if (g_log_forks)
printf("%d: g_fork_count: %d\n", __LINE__, g_fork_count);
exit_without_destructors(res ? STATUS_UNKNOWN_COMMAND : proc_get_last_status());
exit_without_destructors(exit_status);
return EXIT_FAILURE; //above line should always exit
}