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

modifs cd

Browse source
This commit is contained in:
Antoine Riard 2017-03-25 20:54:56 +01:00
parent 1460f17c30
commit c506b8e002
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
42sh/src/builtin/builtin_cd.c
View file

@ -6,7 +6,7 @@
/* By: ariard <ariard@student.42.fr> +#+ +:+ +#+ */ /* By: ariard <ariard@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/03/25 18:20:42 by ariard #+# #+# */ /* Created: 2017/03/25 18:20:42 by ariard #+# #+# */
/* Updated: 2017/03/25 20:43:35 by ariard ### ########.fr */ /* Updated: 2017/03/25 20:52:21 by ariard ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -96,7 +96,7 @@ int builtin_cd(const char *path, char *const av[],
oldpwd = getcwd(NULL, 0); oldpwd = getcwd(NULL, 0);
if (HAS_CDOPT_P(data.flag) && !(ret = bt_cd_process_symlink(target))) if (HAS_CDOPT_P(data.flag) && !(ret = bt_cd_process_symlink(target)))
builtin_setenv(NULL, (char*[]){"cd", "OLDPWD", oldpwd, NULL}, NULL); builtin_setenv(NULL, (char*[]){"cd", "OLDPWD", oldpwd, NULL}, NULL);
else if (!(ret = bt_cd_process_dotdot(target))) else if (!ret && !(ret = bt_cd_process_dotdot(target)))
builtin_setenv(NULL, (char*[]){"cd", "OLDPWD", oldpwd, NULL}, NULL); builtin_setenv(NULL, (char*[]){"cd", "OLDPWD", oldpwd, NULL}, NULL);
free(target); free(target);
free(oldpwd); free(oldpwd);