diff options
| author | Charles Cabergs <me@cacharle.xyz> | 2020-10-15 11:07:11 +0200 |
|---|---|---|
| committer | Charles Cabergs <me@cacharle.xyz> | 2020-10-15 11:07:11 +0200 |
| commit | 3a67e241a023cc0778fda0eb7cbedb29aa477eda (patch) | |
| tree | 1e525252b34833eadb6e3f257093c3eedf9e59cb /src/builtin/cd.c | |
| parent | 5cf576127982f03eb7464e6e73e7a5fe815ca32e (diff) | |
| parent | 92f9a2f60fe72bbd902ebc91ed4f908eabf7560d (diff) | |
| download | minishell-3a67e241a023cc0778fda0eb7cbedb29aa477eda.tar.gz minishell-3a67e241a023cc0778fda0eb7cbedb29aa477eda.tar.bz2 minishell-3a67e241a023cc0778fda0eb7cbedb29aa477eda.zip | |
Merge branch 'master' into rendurendu
Diffstat (limited to 'src/builtin/cd.c')
| -rw-r--r-- | src/builtin/cd.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/builtin/cd.c b/src/builtin/cd.c index 1ccfdcb..e816217 100644 --- a/src/builtin/cd.c +++ b/src/builtin/cd.c @@ -6,7 +6,7 @@ /* By: charles <charles@student.42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/04/01 17:10:20 by charles #+# #+# */ -/* Updated: 2020/10/15 09:38:55 by cacharle ### ########.fr */ +/* Updated: 2020/10/15 11:04:03 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -36,13 +36,12 @@ int builtin_cd(char **argv, t_env env) oldwd = ""; if (argv[1] != NULL && argv[1][0] == '\0') return (env_export(env, "OLDPWD", oldwd) == NULL ? EVAL_FATAL : 0); + home = argv[1]; if (argv[1] == NULL) { if ((home = env_search(env, "HOME", NULL)) == NULL) return (errorf_ret(1, "cd: HOME not set\n")); } - else - home = argv[1]; if (chdir(home) == -1) return (errorf_ret(1, "cd: %s: %s\n", home, strerror(errno))); if (env_export(env, "OLDPWD", oldwd) == NULL) |