frzysk/42_minishell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge cd builtin

Browse source
This commit is contained in:
mcolonna 2024-07-02 11:35:07 +02:00
commit b0aa3da8ce
2 changed files with 27 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/builtin.c
View file

@ -6,7 +6,7 @@
/* By: jschaft <cecile.schaft@orange.fr> +#+ +:+ +#+ */ /* By: jschaft <cecile.schaft@orange.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/06/03 12:02:45 by jschaft #+# #+# */ /* Created: 2024/06/03 12:02:45 by jschaft #+# #+# */
/* Updated: 2024/07/01 14:20:51 by mcolonna ### ########.fr */ /* Updated: 2024/07/02 11:26:26 by mcolonna ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

46
src/builtin2.c
View file

@ -6,7 +6,7 @@
/* By: jschaft <cecile.schaft@orange.fr> +#+ +:+ +#+ */ /* By: jschaft <cecile.schaft@orange.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/06/25 13:28:29 by jschaft #+# #+# */ /* Created: 2024/06/25 13:28:29 by jschaft #+# #+# */
/* Updated: 2024/07/01 14:18:19 by mcolonna ### ########.fr */ /* Updated: 2024/07/02 11:21:53 by mcolonna ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -90,35 +90,41 @@ int echo_builtin(t_env *env, t_call call, int std[2])
return (0); return (0);
} }
static int go_home(t_env *env) static const char *go_home(t_env *env, bool to_old)
{ {
return (chdir(variables_get(env->variables, "HOME"))); if (!to_old)
return (variables_get(env->variables, "HOME"));
else
return (variables_get(env->variables, "OLDPWD"));
} }
// Execute the builtin cd for the specified path. // Execute the builtin cd for the specified path.
// Return 0 if success, errno if error. // Return 0 if success, errno if error.
int cd_builtin(t_env *env, t_call call, int std[2]) int cd_builtin(t_env *env, t_call call, int std[2])
{ {
int r; int r;
int argc; const char *pwd;
bool go_oldpwd;
(void)std; (void)std;
argc = 0; go_oldpwd = call.argc > 1 && str_eq(call.argv[1], "-");
while (call.argv[argc]) if (call.argc == 1 || go_oldpwd)
argc++; pwd = go_home(env, go_oldpwd);
if (argc == 2) else if (call.argc == 2)
r = chdir(call.argv[1]); pwd = call.argv[1];
else if (argc == 1)
r = go_home(env);
else else
{ return (print_line(fatal_error, 2, "cd: too many arguments"), 1);
print_line(fatal_error, 2, "cd: too many arguments"); r = chdir(pwd);
return (1);
}
if (r) if (r)
{ return (perror("cd"), errno);
perror("cd"); mem_free((char *)variables_get(env->variables, "OLDPWD"));
return (errno); variables_set(env->variables, "OLDPWD",
} variables_get(env->variables, "PWD"));
pwd = getcwd(NULL, 0);
variables_set(env->variables, "PWD",
str_dup(fatal_error, env->mc_global, pwd));
if (go_oldpwd)
print_line(fatal_error, 1, pwd);
free((char *)pwd);
return (0); return (0);
} }