Kinou/Minishell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

norme built-in

Browse Source
This commit is contained in:
PrStein 2022-04-20 16:12:28 +02:00
parent 64b25ac82e
commit 3015b4c345
3 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
includes/minishell.h
View File

@ -6,7 +6,7 @@
/* By: sadjigui <sadjigui@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2022/03/09 22:33:49 by apommier #+# #+# */
/* Updated: 2022/04/20 15:41:57 by sadjigui ### ########.fr */
/* Updated: 2022/04/20 16:10:27 by sadjigui ### ########.fr */
/* */
/* ************************************************************************** */
@ -148,7 +148,7 @@ int check_variable(char *variable);
int cd_error(t_s_cmd *cmd, char *str, int i);
int size_path(char **str);
int check_return(t_s_cmd *cmd, int var);
void change_oldpwd(char **env, int old_pwd, int pwd, char *p);
void change_oldpwd(char **env, int old_pwd, int pwd, char *p);
//real builtin
void ft_exit(t_s_cmd *cmd);

10
srcs/built_in/cd.c
View File

@ -6,7 +6,7 @@
/* By: sadjigui <sadjigui@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2022/03/21 18:30:26 by sadjigui #+# #+# */
/* Updated: 2022/04/20 15:52:57 by sadjigui ### ########.fr */
/* Updated: 2022/04/20 16:09:32 by sadjigui ### ########.fr */
/* */
/* ************************************************************************** */
@ -53,16 +53,16 @@ int check_home(t_s_cmd *cmd, char *p, char **env)
p = ft_substr(env[home], 5, ft_strlen(env[len_home]));
if (chdir(p) == 0)
{
change_oldpwd(env, old_pwd, pwd, p);
change_oldpwd(env, old_pwd, pwd, p);
free(p);
return (check_return(cmd, 0));
return (check_return(cmd, 0));
}
else
{
ft_putstr_fd("Minishell: cd: ", 2);
ft_putstr_fd(p, 2);
ft_putstr_fd(": No such directory\n", 2);
free(p);
free(p);
return (check_return(cmd, 1));
}
}
@ -100,7 +100,7 @@ int open_directory(t_s_cmd *cmd)
{
if (find_it(cmd->big_cmd->env, "HOME") < 0)
return (cd_error(cmd, "Minishell: cd: HOME not set", 1));
return(check_home(cmd, p, cmd->big_cmd->env));
return (check_home(cmd, p, cmd->big_cmd->env));
}
else if (cmd->nb_args == 2)
i = check_dir(cmd);

27
srcs/built_in/cd_utils.c Normal file
View File

@ -0,0 +1,27 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* cd_utils.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: sadjigui <sadjigui@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2022/04/20 15:35:02 by sadjigui #+# #+# */
/* Updated: 2022/04/20 16:07:58 by sadjigui ### ########.fr */
/* */
/* ************************************************************************** */
#include "../../includes/minishell.h"
void change_oldpwd(char **env, int old_pwd, int pwd, char *p)
{
if (find_it(env, "PWD") != -1)
{
if (find_it(env, "OLDPWD") != -1)
{
free(env[old_pwd]);
env[old_pwd] = ft_strjoin("OLD", env[pwd]);
}
free(env[pwd]);
env[pwd] = ft_strjoin("PWD=", p);
}
}