Merge branch 'main' of github.com:mdev9/minishell
This commit is contained in:
5
Makefile
5
Makefile
@ -3,10 +3,10 @@
|
||||
# ::: :::::::: #
|
||||
# Makefile :+: :+: :+: #
|
||||
# +:+ +:+ +:+ #
|
||||
# By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ #
|
||||
# By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ #
|
||||
# +#+#+#+#+#+ +#+ #
|
||||
# Created: 2023/07/28 00:35:01 by tomoron #+# #+# #
|
||||
# Updated: 2024/02/16 22:26:51 by tomoron ### ########.fr #
|
||||
# Updated: 2024/02/17 02:24:43 by marde-vr ### ########.fr #
|
||||
# #
|
||||
# **************************************************************************** #
|
||||
|
||||
@ -18,6 +18,7 @@ SRCS_RAW = main.c\
|
||||
exec.c\
|
||||
exit.c\
|
||||
echo.c\
|
||||
alias.c\
|
||||
pwd.c\
|
||||
parsing.c\
|
||||
debug.c\
|
||||
|
@ -6,8 +6,13 @@
|
||||
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2024/02/16 23:16:07 by marde-vr #+# #+# */
|
||||
/* Updated: 2024/02/16 23:16:08 by marde-vr ### ########.fr */
|
||||
/* Updated: 2024/02/17 02:23:21 by marde-vr ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
#include "minishell.h"
|
||||
|
||||
void alias(t_cmd *args)
|
||||
{
|
||||
|
||||
}
|
@ -6,7 +6,7 @@
|
||||
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2024/02/07 14:12:49 by tomoron #+# #+# */
|
||||
/* Updated: 2024/02/17 00:26:16 by marde-vr ### ########.fr */
|
||||
/* Updated: 2024/02/17 02:21:53 by marde-vr ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
@ -27,6 +27,8 @@ int exec_builtin(t_cmd *parsed_cmd, t_env *env)
|
||||
g_return_code = pwd();
|
||||
else if (!ft_strcmp(parsed_cmd->token, "cd"))
|
||||
g_return_code = cd(parsed_cmd);
|
||||
else if (!ft_strcmp(parsed_cmd->token, "alias"))
|
||||
g_return_code = alias(parsed_cmd);
|
||||
else
|
||||
return (STDIN_FILENO);
|
||||
return (STDOUT_FILENO);
|
||||
|
@ -6,7 +6,7 @@
|
||||
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2024/02/04 17:31:38 by tomoron #+# #+# */
|
||||
/* Updated: 2024/02/16 22:25:40 by tomoron ### ########.fr */
|
||||
/* Updated: 2024/02/17 02:29:12 by marde-vr ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
@ -75,5 +75,6 @@ char **env_to_char_tab(t_env *env);
|
||||
void handle_minishellrc(t_env *env);
|
||||
t_cmd *handle_alias(t_cmd *cmd, t_env *env, t_alias *alias);
|
||||
int cd(t_cmd *args);
|
||||
int alias(t_cmd *args);
|
||||
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user