From 6660c5ed2cb22a68a9ffc42d58fc2e2377d09ace Mon Sep 17 00:00:00 2001 From: Jack Halford Date: Thu, 9 Mar 2017 14:35:49 +0100 Subject: [PATCH] issue #73 --- 42sh/includes/minishell.h | 2 +- 42sh/includes/types.h | 2 +- 42sh/src/builtin/builtin_exit.c | 4 ++-- 42sh/src/lexer/lexer_end.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/42sh/includes/minishell.h b/42sh/includes/minishell.h index 6dcbefc4..ec5f0368 100644 --- a/42sh/includes/minishell.h +++ b/42sh/includes/minishell.h @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/10 13:07:44 by jhalford #+# #+# */ -/* Updated: 2017/03/08 20:53:04 by ariard ### ########.fr */ +/* Updated: 2017/03/09 14:33:59 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/includes/types.h b/42sh/includes/types.h index 15b72159..bb719de7 100644 --- a/42sh/includes/types.h +++ b/42sh/includes/types.h @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/13 17:11:48 by jhalford #+# #+# */ -/* Updated: 2017/03/08 17:16:00 by ariard ### ########.fr */ +/* Updated: 2017/03/09 14:34:12 by jhalford ### ########.fr */ /* Updated: 2017/03/07 18:35:11 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/builtin/builtin_exit.c b/42sh/src/builtin/builtin_exit.c index c77af593..c5c32983 100644 --- a/42sh/src/builtin/builtin_exit.c +++ b/42sh/src/builtin/builtin_exit.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/11/28 14:28:41 by jhalford #+# #+# */ -/* Updated: 2017/03/09 11:17:21 by gwojda ### ########.fr */ +/* Updated: 2017/03/09 14:35:20 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ @@ -23,7 +23,7 @@ int builtin_exit(const char *path, char *const av[], char *const envp[]) (void)path; jobc = &data_singleton()->jobc; jlist = jobc->first_job; - if (jlist && !notified) + if (SH_HAS_JOBC(data_singleton()->opts) && jlist && !notified) { notified = 1; ft_dprintf(2, "{red}%s: you have live jobs (running or suspended).{eoc}\n", SHELL_NAME); diff --git a/42sh/src/lexer/lexer_end.c b/42sh/src/lexer/lexer_end.c index 3ae67e26..ec6dd699 100644 --- a/42sh/src/lexer/lexer_end.c +++ b/42sh/src/lexer/lexer_end.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/03/05 16:58:24 by jhalford #+# #+# */ -/* Updated: 2017/03/09 14:31:23 by jhalford ### ########.fr */ +/* Updated: 2017/03/09 14:32:07 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */