jack/42-archive
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

norme on shell_init

Browse source
This commit is contained in:
wescande 2017-03-24 17:05:49 +01:00
parent 9c60efc70c
commit bf093784d3
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
42sh/src/main/shell_init.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jhalford@student.42.fr> +#+ +:+ +#+ */ /* By: jhalford <jhalford@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/12 17:23:59 by jhalford #+# #+# */ /* Created: 2016/12/12 17:23:59 by jhalford #+# #+# */
/* Updated: 2017/03/24 15:12:31 by jhalford ### ########.fr */ /* Updated: 2017/03/24 17:05:29 by wescande ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -29,10 +29,9 @@ int get_c_arg(char ***av, t_data *data)
return (0); return (0);
} }
static int get_input_fd(t_data *data) static int get_input_fd(t_data *data, char *file)
{ {
static int fds[2] = {-1, STDIN}; static int fds[2] = {-1, STDIN};
char *file;
struct stat buf; struct stat buf;
if (data->opts & SH_OPTS_LC && (file = data->c_arg)) if (data->opts & SH_OPTS_LC && (file = data->c_arg))
@ -94,7 +93,7 @@ int shell_init(int ac, char **av)
} }
if (!isatty(STDIN) || *data->av_data) if (!isatty(STDIN) || *data->av_data)
data->opts &= ~(SH_INTERACTIVE | SH_OPTS_JOBC); data->opts &= ~(SH_INTERACTIVE | SH_OPTS_JOBC);
if ((data->fd = get_input_fd(data)) < 0) if ((data->fd = get_input_fd(data, NULL)) < 0)
return (-1); return (-1);
if (SH_IS_INTERACTIVE(data->opts) && interactive_settings() < 0) if (SH_IS_INTERACTIVE(data->opts) && interactive_settings() < 0)
return (-1); return (-1);