From f0837247bd676cbf3f00bc17636c2c19be49814f Mon Sep 17 00:00:00 2001 From: Tanguy MAZE Date: Sat, 1 Feb 2020 16:02:38 +0100 Subject: [PATCH] file norming --- .ccls | 4 --- Makefile | 7 +++-- README.org | 33 ---------------------- includes/minishell.h | 13 ++++++++- srcs/check_path_slash_cd.c | 36 ++++++++++++++++++++++++ srcs/cmd_cd.c | 25 +---------------- srcs/def_env.c | 40 +++++++++++++++++++++++++++ srcs/main.c | 29 +------------------- srcs/ms_exec.c | 39 +------------------------- srcs/ms_exec_utils.c | 56 ++++++++++++++++++++++++++++++++++++++ srcs/ms_ext.c | 9 +----- 11 files changed, 153 insertions(+), 138 deletions(-) delete mode 100644 .ccls delete mode 100644 README.org create mode 100644 srcs/check_path_slash_cd.c create mode 100644 srcs/def_env.c create mode 100644 srcs/ms_exec_utils.c diff --git a/.ccls b/.ccls deleted file mode 100644 index fd46537..0000000 --- a/.ccls +++ /dev/null @@ -1,4 +0,0 @@ -clang --Iincludes --Ilibft/includes -%c %h -Wall -Wextra -Werror -g-Wall -Wextra -Werror -g \ No newline at end of file diff --git a/Makefile b/Makefile index e24b2d0..d21b734 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ # By: tmaze +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2019/03/27 16:51:02 by tmaze #+# #+# # -# Updated: 2020/01/30 12:00:42 by tmaze ### ########.fr # +# Updated: 2020/02/01 15:54:10 by tmaze ### ########.fr # # # #******************************************************************************# @@ -44,7 +44,10 @@ SRC = main.c \ cmd_echo.c \ ms_exec.c \ ms_ext.c \ - put_error_cd.c + put_error_cd.c \ + ms_exec_utils.c \ + def_env.c \ + check_path_slash_cd.c OBJ = $(SRC:.c=.o) diff --git a/README.org b/README.org deleted file mode 100644 index ccfc212..0000000 --- a/README.org +++ /dev/null @@ -1,33 +0,0 @@ -# **************************************************************************** # -# # -# ::: :::::::: # -# README.org :+: :+: :+: # -# +:+ +:+ +:+ # -# By: tmaze +#+ +:+ +#+ # -# +#+#+#+#+#+ +#+ # -# Created: 2018/10/26 13:33:24 by tmaze #+# #+# # -# Updated: 2018/11/18 16:57:11 by tmaze ### ########.fr # -# # -# **************************************************************************** # - -#+AUTHOR: tmaze -#+TITLE: 42Minishell - -/Minishell project from Ecole 42/ - -* Todo list -** TODO étudier les différents man du sujet [5/10] - - [X] access - - [X] open, close, read, write - - [X] getcwd, chdir - - [X] stat, lstat, fstat - - [X] fork, execve - - [ ] wait, waitpid, wait3, wait4 - - [ ] signal, kill - - [ ] exit - - [ ] environ - - [ ] builtin -** TODO réaliser un shell qui accepte les commandes - - [ ] lanceur de binaires - - [ ] gestion de l'environement -** TODO réaliser les builtins diff --git a/includes/minishell.h b/includes/minishell.h index 57addc9..f23818c 100644 --- a/includes/minishell.h +++ b/includes/minishell.h @@ -6,7 +6,7 @@ /* By: tmaze +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2018/11/18 13:12:34 by tmaze #+# #+# */ -/* Updated: 2020/01/26 22:19:25 by tmaze ### ########.fr */ +/* Updated: 2020/02/01 15:57:09 by tmaze ### ########.fr */ /* */ /* ************************************************************************** */ @@ -39,4 +39,15 @@ void *ft_strdel_null(char **s); void *put_error_cd(char *file, char *msg); int put_error_cd2(char *file, char *msg); +char *check_path_slash_cd(char *exec); + +void exec_cmd_child(char *path, char **argv, char **env_tab, + t_env **env); +int ft_isin(char *str, char c); +void *put_error(char *file, char *msg); + +t_env *def_env(void); + +void *return_null(char *msg); + #endif diff --git a/srcs/check_path_slash_cd.c b/srcs/check_path_slash_cd.c new file mode 100644 index 0000000..3d5348c --- /dev/null +++ b/srcs/check_path_slash_cd.c @@ -0,0 +1,36 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* check_path_slach_cd.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: tmaze +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2020/02/01 15:29:57 by tmaze #+# #+# */ +/* Updated: 2020/02/01 15:31:19 by tmaze ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "minishell.h" + +char *check_path_slash_cd(char *exec) +{ + int i; + struct stat info; + struct stat info2; + + if (exec[0] == '/') + { + if ((i = access(exec, F_OK)) != 0) + return (put_error_cd(exec, "no such file or directory")); + if ((i = lstat(exec, &info)) != 0) + return (put_error_cd(exec, "can't determine info")); + if ((S_ISLNK(info.st_mode) + && ((i = stat(exec, &info2)) != 0 || !S_ISDIR(info2.st_mode))) + && !S_ISDIR(info.st_mode)) + return (put_error_cd(exec, "not a directory")); + if ((i = access(exec, X_OK)) != 0) + return (put_error_cd(exec, "permission denied")); + return (exec); + } + return (NULL); +} diff --git a/srcs/cmd_cd.c b/srcs/cmd_cd.c index 326927b..dfb0605 100644 --- a/srcs/cmd_cd.c +++ b/srcs/cmd_cd.c @@ -6,35 +6,12 @@ /* By: tmaze +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/01/07 16:44:40 by tmaze #+# #+# */ -/* Updated: 2020/01/26 22:17:48 by tmaze ### ########.fr */ +/* Updated: 2020/02/01 15:32:59 by tmaze ### ########.fr */ /* */ /* ************************************************************************** */ #include "minishell.h" -char *check_path_slash_cd(char *exec) -{ - int i; - struct stat info; - struct stat info2; - - if (exec[0] == '/') - { - if ((i = access(exec, F_OK)) != 0) - return (put_error_cd(exec, "no such file or directory")); - if ((i = lstat(exec, &info)) != 0) - return (put_error_cd(exec, "can't determine info")); - if ((S_ISLNK(info.st_mode) - && ((i = stat(exec, &info2)) != 0 || !S_ISDIR(info2.st_mode))) - && !S_ISDIR(info.st_mode)) - return (put_error_cd(exec, "not a directory")); - if ((i = access(exec, X_OK)) != 0) - return (put_error_cd(exec, "permission denied")); - return (exec); - } - return (NULL); -} - int cmd_cd_update_env(char *path, t_env **env, char opt) { t_env *pwd; diff --git a/srcs/def_env.c b/srcs/def_env.c new file mode 100644 index 0000000..d785250 --- /dev/null +++ b/srcs/def_env.c @@ -0,0 +1,40 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* def_env.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: tmaze +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2020/02/01 15:53:22 by tmaze #+# #+# */ +/* Updated: 2020/02/01 15:53:34 by tmaze ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "minishell.h" + +t_env *def_env(void) +{ + t_env *ret; + t_env *n; + char p[PATH_MAX]; + + n = ft_memalloc(sizeof(t_env)); + if (n != NULL && ((n->key = ft_strnew(3)) == NULL || !getcwd(p, PATH_MAX))) + ft_envdelelem(&n); + if (n != NULL) + ft_strcpy(n->key, "PWD"); + if (n != NULL && (n->val = ft_strdup(p)) == NULL) + ft_envdelelem(&n); + if (n != NULL) + ft_envaddend(&ret, n); + n = ft_memalloc(sizeof(t_env)); + if (n != NULL && (n->key = ft_strnew(5)) == NULL) + ft_envdelelem(&n); + if (n != NULL) + ft_strcpy(n->key, "SHLVL"); + if (n != NULL && (n->val = ft_strdup("1")) == NULL) + ft_envdelelem(&n); + if (n != NULL) + ft_envaddend(&ret, n); + return (ret); +} diff --git a/srcs/main.c b/srcs/main.c index 4c03b2a..8541331 100644 --- a/srcs/main.c +++ b/srcs/main.c @@ -6,39 +6,12 @@ /* By: tmaze +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/09/19 17:08:46 by tmaze #+# #+# */ -/* Updated: 2020/01/30 13:47:35 by tmaze ### ########.fr */ +/* Updated: 2020/02/01 15:54:34 by tmaze ### ########.fr */ /* */ /* ************************************************************************** */ #include "minishell.h" -t_env *def_env(void) -{ - t_env *ret; - t_env *n; - char p[PATH_MAX]; - - n = ft_memalloc(sizeof(t_env)); - if (n != NULL && ((n->key = ft_strnew(3)) == NULL || !getcwd(p, PATH_MAX))) - ft_envdelelem(&n); - if (n != NULL) - ft_strcpy(n->key, "PWD"); - if (n != NULL && (n->val = ft_strdup(p)) == NULL) - ft_envdelelem(&n); - if (n != NULL) - ft_envaddend(&ret, n); - n = ft_memalloc(sizeof(t_env)); - if (n != NULL && (n->key = ft_strnew(5)) == NULL) - ft_envdelelem(&n); - if (n != NULL) - ft_strcpy(n->key, "SHLVL"); - if (n != NULL && (n->val = ft_strdup("1")) == NULL) - ft_envdelelem(&n); - if (n != NULL) - ft_envaddend(&ret, n); - return (ret); -} - char *inc_shlvl(char **shlvl) { char *ret; diff --git a/srcs/ms_exec.c b/srcs/ms_exec.c index 81b43f2..fdc3c17 100644 --- a/srcs/ms_exec.c +++ b/srcs/ms_exec.c @@ -6,32 +6,12 @@ /* By: tmaze +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/09/26 16:25:00 by tmaze #+# #+# */ -/* Updated: 2020/01/30 11:48:25 by tmaze ### ########.fr */ +/* Updated: 2020/02/01 15:47:08 by tmaze ### ########.fr */ /* */ /* ************************************************************************** */ #include "minishell.h" -int ft_isin(char *str, char c) -{ - int i; - - i = 0; - while (str && str[i]) - if (str[i++] == c) - return (i - 1); - return (-1); -} - -void *put_error(char *file, char *msg) -{ - ft_putstr("minishell: "); - ft_putstr(file); - ft_putstr(": "); - ft_putendl(msg); - return (NULL); -} - char *check_path_slash(char *exec) { int i; @@ -82,12 +62,6 @@ char *check_path_dot(char *exec, t_env *env) return (put_error(exec, "no such file or directory")); } -void *ft_strdel_null(char **s) -{ - ft_strdel(s); - return (NULL); -} - char *check_path_elems(char **path_elems, char *exec) { int i; @@ -146,17 +120,6 @@ char *check_path(char *exec, t_env *env) return (ret); } -void exec_cmd_child(char *path, char **argv, char **env_tab, t_env **env) -{ - execve(path, argv, env_tab); - ft_putendl_fd("minishell: error", 1); - if (ft_strcmp(path, argv[0]) != 0) - ft_strdel(&path); - ft_del_words_tables(&env_tab); - ft_envdel(env); - exit(-1); -} - int exec_cmd(char **argv, t_env **env) { int ret; diff --git a/srcs/ms_exec_utils.c b/srcs/ms_exec_utils.c new file mode 100644 index 0000000..054484a --- /dev/null +++ b/srcs/ms_exec_utils.c @@ -0,0 +1,56 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ms_exec_utils.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: tmaze +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2020/02/01 15:43:41 by tmaze #+# #+# */ +/* Updated: 2020/02/01 15:56:49 by tmaze ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "minishell.h" + +void exec_cmd_child(char *path, char **argv, char **env_tab, t_env **env) +{ + execve(path, argv, env_tab); + ft_putendl_fd("minishell: error", 1); + if (ft_strcmp(path, argv[0]) != 0) + ft_strdel(&path); + ft_del_words_tables(&env_tab); + ft_envdel(env); + exit(-1); +} + +void *ft_strdel_null(char **s) +{ + ft_strdel(s); + return (NULL); +} + +int ft_isin(char *str, char c) +{ + int i; + + i = 0; + while (str && str[i]) + if (str[i++] == c) + return (i - 1); + return (-1); +} + +void *put_error(char *file, char *msg) +{ + ft_putstr("minishell: "); + ft_putstr(file); + ft_putstr(": "); + ft_putendl(msg); + return (NULL); +} + +void *return_null(char *msg) +{ + ft_printf("%s\n", msg); + return (NULL); +} diff --git a/srcs/ms_ext.c b/srcs/ms_ext.c index ca0c0bc..10d76c9 100644 --- a/srcs/ms_ext.c +++ b/srcs/ms_ext.c @@ -6,18 +6,12 @@ /* By: tmaze +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/10/25 18:21:47 by tmaze #+# #+# */ -/* Updated: 2020/01/30 15:42:17 by tmaze ### ########.fr */ +/* Updated: 2020/02/01 15:56:43 by tmaze ### ########.fr */ /* */ /* ************************************************************************** */ #include "minishell.h" -void *return_null(char *msg) -{ - ft_printf("%s\n", msg); - return (NULL); -} - void ft_strreplace(char **dst, char *src, int *index, t_env *elem) { if (*dst != NULL) @@ -57,7 +51,6 @@ char *replace_env(char *src, t_env *elem, int key_size, int i) int res_len; res_len = ft_strlen(src) - key_size + ft_strlen(elem->val); - ft_printf("size replace: %d\n", res_len); if ((ret = ft_strnew(res_len)) != NULL) { ft_strncpy(ret, src, i);