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

commit merge

Browse source
This commit is contained in:
gwojda 2017-02-17 11:16:36 +01:00
commit 497ab7a02a
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
42sh/src/builtin/builtin_env.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jhalford@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/11/28 14:14:20 by jhalford #+# #+# */
/* Updated: 2017/02/16 12:40:08 by gwojda ### ########.fr */
/* Updated: 2017/02/17 10:27:05 by gwojda ### ########.fr */
/* */
/* ************************************************************************** */
@ -131,5 +131,6 @@ int builtin_env(const char *path, char *const argv[], char *const envp[])
if (*argv)
++argv;
}
ft_sstrfree(env);
return (0);
}

2
42sh/src/history/history.c
View file

@ -6,7 +6,7 @@
/* By: gwojda <gwojda@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/02/02 15:22:19 by gwojda #+# #+# */
/* Updated: 2017/02/09 16:24:02 by jhalford ### ########.fr */
/* Updated: 2017/02/16 16:12:59 by gwojda ### ########.fr */
/* */
/* ************************************************************************** */

4
42sh/src/line-editing/ft_prompt.c
View file

@ -6,7 +6,7 @@
/* By: gwojda <gwojda@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/13 13:51:33 by gwojda #+# #+# */
/* Updated: 2017/02/16 12:38:58 by gwojda ### ########.fr */
/* Updated: 2017/02/16 14:27:57 by gwojda ### ########.fr */
/* */
/* ************************************************************************** */
@ -71,7 +71,7 @@ static int ft_currend_dir(void)
env = data_singleton()->env;
if (!(pwd = ft_getenv(env, "PWD")))
return (0);
return (-1);
if (ft_getenv(env, "HOME") && !ft_strcmp(pwd, ft_getenv(env, "HOME")))
{
ft_printf("%c ", '~');

4
42sh/src/line-editing/lib_line_editing/toolz2.c
View file

@ -6,7 +6,7 @@
/* By: gwojda <gwojda@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/01/07 11:00:28 by gwojda #+# #+# */
/* Updated: 2017/02/14 14:43:32 by gwojda ### ########.fr */
/* Updated: 2017/02/16 16:05:40 by gwojda ### ########.fr */
/* */
/* ************************************************************************** */
@ -25,7 +25,7 @@ void ft_puttermcaps(char *str)
char *res;
char *env;
env = getenv("TERM");
env = ft_getenv(data_singleton()->env, "TERM");
if ((res = tgetstr(str, &env)) == NULL)
return ;
tputs(res, 0, ft_put);