42_adjoly/ft_minipowershell
1
0
Fork 0
mirror of https://github.com/KeyZox71/ft_minipowershell.git synced 2025-03-16 11:56:49 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

「✨」 feat: CD working

Browse Source
This commit is contained in:
Adam JOLY
2024-06-25 11:23:25 +02:00
parent 5710f193d7
commit 1ddd5534c8
3 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/builtins.h
View File

@ -6,7 +6,7 @@
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */ /* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/06/22 13:05:18 by adjoly #+# #+# */ /* Created: 2024/06/22 13:05:18 by adjoly #+# #+# */
/* Updated: 2024/06/24 12:47:28 by adjoly ### ########.fr */ /* Updated: 2024/06/25 10:46:04 by adjoly ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -15,7 +15,10 @@
# include "env.h" # include "env.h"
# define PATH_MAX_LEN 4096
void ft_pwd(t_env *env); void ft_pwd(t_env *env);
void ft_cd(t_env *env, char *args); void ft_cd(t_env *env, char *args);
char *ret_cwd(void);
#endif #endif

20
src/builtins/ft_cd.c
View File

@ -6,13 +6,14 @@
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */ /* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/06/22 15:07:24 by adjoly #+# #+# */ /* Created: 2024/06/22 15:07:24 by adjoly #+# #+# */
/* Updated: 2024/06/24 18:48:11 by adjoly ### ########.fr */ /* Updated: 2024/06/25 11:22:08 by adjoly ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "minishell.h" #include "minishell.h"
#include "env.h" #include "env.h"
#include "libft.h" #include "libft.h"
#include "builtins.h"
char *__get_parent_directory(char *pwd) char *__get_parent_directory(char *pwd)
{ {
@ -29,34 +30,31 @@ char *__get_parent_directory(char *pwd)
} }
parent = ft_calloc(dir - pwd + 1, sizeof(char)); parent = ft_calloc(dir - pwd + 1, sizeof(char));
ft_strlcpy(parent, pwd, dir - pwd + 1); ft_strlcpy(parent, pwd, dir - pwd + 1);
free(pwd);
return (parent); return (parent);
} }
char *ret_cwd(void)
{
}
void ft_cd(t_env *env, char *args) void ft_cd(t_env *env, char *args)
{ {
char *pwd;
char *new_pwd; char *new_pwd;
int ret;
new_pwd = NULL; new_pwd = NULL;
pwd = getcwd(); pwd = ret_cwd();
ft_putendl_fd(args, STDOUT_FILENO); ft_putendl_fd(args, STDOUT_FILENO);
ft_putendl_fd(env_get_value("PWD", env), STDOUT_FILENO); ft_putendl_fd(pwd, STDOUT_FILENO);
if (!args) if (!args)
new_pwd = env_get_value("HOME", env); new_pwd = env_get_value("HOME", env);
else if (args[0] == '/') else if (args[0] == '/')
new_pwd = ft_strdup(args); new_pwd = ft_strdup(args);
else if (is_str(args, "..")) else if (is_str(args, ".."))
new_pwd = __get_parent_directory(env_get_value("PWD", env)); new_pwd = __get_parent_directory(pwd);
ft_putendl_fd(new_pwd, STDOUT_FILENO);
ret = chdir(new_pwd); ret = chdir(new_pwd);
if (ret == -1) if (ret == -1)
{ {
return ;
} }
env_edit("PWD", new_pwd, env); env_edit("PWD", new_pwd, env);
free(args); free(args);
ft_putendl_fd(new_pwd, STDOUT_FILENO);
} }

21
src/builtins/ret_cwd.c Normal file
View File

@ -0,0 +1,21 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ret_cwd.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/06/25 10:41:43 by adjoly #+# #+# */
/* Updated: 2024/06/25 10:44:01 by adjoly ### ########.fr */
/* */
/* ************************************************************************** */
#include "builtins.h"
#include <unistd.h>
char *ret_cwd(void)
{
char buf[PATH_MAX_LEN];
return (getcwd(buf, PATH_MAX_LEN));
}