github-mirror/fish-shell
github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-02-21 10:11:10 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "improve sanity check code"

Browse Source 
This reverts commit 7e6543c4cd0158e1da6810e89ab1c785eb8681c3.
This commit is contained in:
Kurtis Rader 2017-01-24 07:34:51 -08:00
parent 64485167e9
commit bf2d61c6fd
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/proc.cpp
View File

@ -984,16 +984,18 @@ int proc_format_status(int status) {
}
void proc_sanity_check() {
job_t *fg_job = NULL;
job_t *j;
job_t *fg_job = 0;
job_iterator_t jobs;
while (job_t *j = jobs.next()) {
while ((j = jobs.next())) {
if (!job_get_flag(j, JOB_CONSTRUCTED)) continue;
// More than one foreground job?
if (job_get_flag(j, JOB_FOREGROUND) && !(job_is_stopped(j) || job_is_completed(j))) {
if (fg_job) {
if (fg_job != 0) {
debug(0, _(L"More than one job in foreground: job 1: '%ls' job 2: '%ls'"),
fg_job->command_wcstr(), j->command_wcstr());
sanity_lose();

7
src/sanity.cpp
View File

@ -12,18 +12,19 @@
#include "sanity.h"
/// Status from earlier sanity checks.
static bool insane = false;
static int insane;
void sanity_lose() {
debug(0, _(L"Errors detected, shutting down. Break on sanity_lose() to debug."));
insane = true;
insane = 1;
}
bool sanity_check() {
int sanity_check() {
if (!insane && shell_is_interactive()) history_sanity_check();
if (!insane) reader_sanity_check();
if (!insane) kill_sanity_check();
if (!insane) proc_sanity_check();
return insane;
}

2
src/sanity.h
View File

@ -6,7 +6,7 @@
void sanity_lose();
/// Perform sanity checks, return 1 if program is in a sane state 0 otherwise.
bool sanity_check();
int sanity_check();
/// Try and determine if ptr is a valid pointer. If not, loose sanity.
///