diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/minishell.h | 20 | ||||
| -rw-r--r-- | include/ms_glob.h | 8 | ||||
| -rw-r--r-- | include/utils.h | 31 |
3 files changed, 24 insertions, 35 deletions
diff --git a/include/minishell.h b/include/minishell.h index 67c2266..de6e923 100644 --- a/include/minishell.h +++ b/include/minishell.h @@ -6,7 +6,7 @@ /* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/02/26 15:33:51 by cacharle #+# #+# */ -/* Updated: 2020/07/14 11:06:50 by charles ### ########.fr */ +/* Updated: 2020/07/15 13:11:38 by charles ### ########.fr */ /* */ /* ************************************************************************** */ @@ -60,9 +60,11 @@ t_path path_update(t_path path, char *path_var); ** env.c */ +// FIXME refactor env code t_env env_from_array(char **envp); int env_keycmp(char *var, char *key); char *env_search(t_env env, char *key); +int env_search_index(t_env env, char *key); char *env_search_first_match(t_env env, const char *haystack); char *env_export(t_env env, char *key, char *value); @@ -133,5 +135,21 @@ typedef struct } t_error; void error_eval_put(enum e_error id, char *content); +void error_put_invalid_identifier(char *prefix, char *identifier); + +/* +** utils.c +*/ + +typedef int (*t_directory_iter_func)(char*, struct dirent*, void*); + +int utils_directory_iter( + char *dirname, + void *param, + t_directory_iter_func f +); + +size_t utils_var_end(char *name); +bool utils_valid_identifier(char *name); #endif diff --git a/include/ms_glob.h b/include/ms_glob.h index 5b5c932..e340c45 100644 --- a/include/ms_glob.h +++ b/include/ms_glob.h @@ -6,7 +6,7 @@ /* By: charles <charles.cabergs@gmail.com> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/04/05 11:45:11 by charles #+# #+# */ -/* Updated: 2020/06/09 17:51:34 by charles ### ########.fr */ +/* Updated: 2020/07/15 12:12:22 by charles ### ########.fr */ /* */ /* ************************************************************************** */ @@ -16,10 +16,12 @@ # include <dirent.h> # include <unistd.h> # include <stddef.h> +# include <limits.h> + # include "libft_str.h" # include "libft_vec.h" -# include "utils.h" -# include <limits.h> + +# include "minishell.h" struct s_glob_param { diff --git a/include/utils.h b/include/utils.h deleted file mode 100644 index 6f2fbc9..0000000 --- a/include/utils.h +++ /dev/null @@ -1,31 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* utils.h :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: charles <charles.cabergs@gmail.com> +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2020/04/05 12:05:49 by charles #+# #+# */ -/* Updated: 2020/04/05 14:51:38 by charles ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#ifndef UTILS_H -# define UTILS_H - -/* -** \file utils.h -** \brief Various utilitary functions -*/ - -typedef int (*t_directory_iter_func)(char*, struct dirent*, void*); - -int utils_directory_iter( - char *dirname, - void *param, - t_directory_iter_func f -); - -size_t utils_var_end(char *name); - -#endif |