starnakin/42_minishell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

_

Browse Source
This commit is contained in:
Etienne Rey-bethbeder
2023-04-18 13:30:17 +02:00
parent 3e7dcd1ba9
commit 62e887cfbd
8 changed files with 39 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
builtins/builtins.h
View File

@ -6,7 +6,7 @@
/* By: cchauvet <cchauvet@student.42angouleme.fr +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2023/03/27 13:41:30 by cchauvet #+# #+# */
/* Updated: 2023/04/05 12:16:50 by erey-bet ### ########.fr */
/* Updated: 2023/04/18 12:57:36 by erey-bet ### ########.fr */
/* */
/* ************************************************************************** */
@ -16,10 +16,10 @@
int echo(int fd, char **strs);
int pwd(int fd);
char *get_pwd(int fd);
char *get_pwd(void);
int print_env(t_list **env, int fd);
int ft_export(t_list **env, char **args, int fd);
int move_folder(char **args, int fd);
int move_folder(char **args, t_list **env, int fd);
int unset(t_list **env, char **args, int fd);
int ft_exit(char **args, int err);

4
builtins/builtins_private.h
View File

@ -6,7 +6,7 @@
/* By: cchauvet <cchauvet@student.42angouleme.fr +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2023/03/27 13:41:42 by cchauvet #+# #+# */
/* Updated: 2023/03/31 20:07:36 by erey-bet ### ########.fr */
/* Updated: 2023/04/18 12:57:25 by erey-bet ### ########.fr */
/* */
/* ************************************************************************** */
@ -17,6 +17,6 @@
# include "../env/env.h"
# include "../utils/utils.h"
char *get_pwd(int fd);
char *get_pwd(void);
#endif

22
builtins/cd.c
View File

@ -6,31 +6,37 @@
/* By: erey-bet <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2023/02/20 14:27:36 by erey-bet #+# #+# */
/* Updated: 2023/03/31 15:02:43 by erey-bet ### ########.fr */
/* Updated: 2023/04/18 13:22:22 by erey-bet ### ########.fr */
/* */
/* ************************************************************************** */
#include "./builtins_private.h"
int make_move(char *path, int fd)
int make_move(char *path, t_list **env)
{
char *join;
char *old;
join = ft_strjoin("/", path);
join = ft_strfjoin(get_pwd(fd), join);
join = ft_strfjoin(get_pwd(), join);
old = get_pwd();
if (chdir(join) == 0)
{
set_value_by_key("OLDPWD", old, env);
set_value_by_key("PWD", get_pwd(), env);
free(join);
return (0);
}
free(old);
free(join);
write(2, "cd: No such file or directory\n", 30);
return (1);
}
int move_folder(char **args, int fd)
int move_folder(char **args, t_list **env)
{
char *path;
char *old;
if (args[0] == NULL || args[1] != NULL)
{
@ -40,11 +46,17 @@ int move_folder(char **args, int fd)
path = args[0];
if (path[0] == '/' || ft_strncmp(path, "..", ft_strlen(path)) == 0)
{
old = get_pwd();
if (chdir(path) == 0)
{
set_value_by_key("OLDPWD", old, env);
set_value_by_key("PWD", get_pwd(), env);
return (0);
}
free(old);
write(2, "cd: No such file or directory\n", 30);
return (1);
}
else
return (make_move(path, fd));
return (make_move(path, env));
}

8
builtins/pwd.c
View File

@ -6,7 +6,7 @@
/* By: erey-bet <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2023/02/17 16:09:11 by erey-bet #+# #+# */
/* Updated: 2023/03/09 20:00:19 by erey-bet ### ########.fr */
/* Updated: 2023/04/18 12:59:25 by erey-bet ### ########.fr */
/* */
/* ************************************************************************** */
@ -20,13 +20,13 @@ int pwd(int fd)
ft_putendl_fd(path, fd);
else
{
ft_putendl_fd("Error getcwd", fd);
ft_putendl_fd("Error getcwd", 2);
return (1);
}
return (0);
}
char *get_pwd(int fd)
char *get_pwd(void)
{
char *str;
@ -35,7 +35,7 @@ char *get_pwd(int fd)
return (str);
else
{
ft_putendl_fd("Error getcwd", fd);
ft_putendl_fd("Error getcwd", 2);
return (NULL);
}
}