tom/minishell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

working on cd

Browse Source
This commit is contained in:
mdev9
2024-02-16 21:53:49 +01:00
parent 2a2ef1d63c
commit e0021ed8ce
4 changed files with 43 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -6,7 +6,7 @@
# By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ # # By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2023/07/28 00:35:01 by tomoron #+# #+# # # Created: 2023/07/28 00:35:01 by tomoron #+# #+# #
# Updated: 2024/02/16 21:24:47 by tomoron ### ########.fr # # Updated: 2024/02/16 21:31:30 by marde-vr ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
@ -19,6 +19,7 @@ SRCS = main.c\
exit.c\ exit.c\
echo.c\ echo.c\
pwd.c\ pwd.c\
cd.c\
parsing.c\ parsing.c\
debug.c\ debug.c\
env_to_char_tab.c\ env_to_char_tab.c\
@ -27,8 +28,6 @@ SRCS = main.c\
OBJS = $(SRCS:.c=.o) OBJS = $(SRCS:.c=.o)
OBJS_DIR = objs
FLAGS = -Wall -Wextra -Werror -g FLAGS = -Wall -Wextra -Werror -g
LIBFT = libft/libft.a LIBFT = libft/libft.a
@ -38,7 +37,6 @@ NAME = minishell
all: $(NAME) all: $(NAME)
$(NAME) : $(LIBFT) $(OBJS) $(NAME) : $(LIBFT) $(OBJS)
mkdir $(OBJS_DIR)
$(CC) $(FLAGS) $(OBJS) $(LIBFT) -lreadline -o $(NAME) $(CC) $(FLAGS) $(OBJS) $(LIBFT) -lreadline -o $(NAME)
$(LIBFT): $(LIBFT):

37
cd.c Normal file
View File

@ -0,0 +1,37 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* cd.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/02/16 21:02:54 by marde-vr #+# #+# */
/* Updated: 2024/02/16 21:51:28 by marde-vr ### ########.fr */
/* */
/* ************************************************************************** */
#include "minishell.h"
int cd(t_cmd *args, t_env *env)
{
char *cwd;
char *new_wd;
cwd = getcwd(0, 0);
if (args->next->next && args->next->next->type == ARG)
{
ft_printf_fd(2, "minishell: cd: too many arguments\n");
return (1);
}
if (!args->next || args->next->type != ARG)
new_wd = ft_get_env(env, "HOME");
else
{
new_wd = args->next->token;
if (chdir(new_wd) == -1)
perror("chdir");
}
ft_putstr(cwd);
(void)args;
return (0);
}

4
exec.c
View File

@ -6,7 +6,7 @@
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */ /* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/02/07 14:12:49 by tomoron #+# #+# */ /* Created: 2024/02/07 14:12:49 by tomoron #+# #+# */
/* Updated: 2024/02/16 17:26:04 by marde-vr ### ########.fr */ /* Updated: 2024/02/16 21:20:57 by marde-vr ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -27,6 +27,8 @@ int exec_builtin(t_cmd *parsed_cmd, t_env *env)
exit_bt(parsed_cmd, env); exit_bt(parsed_cmd, env);
else if (!ft_strcmp(parsed_cmd->token, "pwd")) else if (!ft_strcmp(parsed_cmd->token, "pwd"))
g_return_code = pwd(); g_return_code = pwd();
else if (!ft_strcmp(parsed_cmd->token, "cd"))
g_return_code = cd(parsed_cmd);
else else
return (STDIN_FILENO); return (STDIN_FILENO);
return (STDOUT_FILENO); return (STDOUT_FILENO);

6
main.c
View File

@ -6,11 +6,7 @@
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */ /* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/02/02 21:59:20 by tomoron #+# #+# */ /* Created: 2024/02/02 21:59:20 by tomoron #+# #+# */
<<<<<<< HEAD /* Updated: 2024/02/16 21:30:50 by marde-vr ### ########.fr */
/* Updated: 2024/02/16 16:37:13 by tomoron ### ########.fr */
=======
/* Updated: 2024/02/16 18:21:27 by marde-vr ### ########.fr */
>>>>>>> ad1de58fb2aacb8a3b1b7ef5d74fc6d87f4550b2
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */