diff --git a/compile_commands.json b/compile_commands.json deleted file mode 100644 index 1a16943..0000000 --- a/compile_commands.json +++ /dev/null @@ -1,21 +0,0 @@ -[ - { - "directory": "/nfs/homes/adjoly/Documents/ft_minipowershell", - "arguments": [ - "cc", - "-I", - "include/", - "-I", - "libft/", - "-Werror", - "-Wall", - "-Wextra", - "-g", - "src/main.c", - "-c", - "-o", - "obj/src/main.o" - ], - "file": "src/main.c" - } -] diff --git a/include/minishell.h b/include/minishell.h index 88bccc7..36e0139 100644 --- a/include/minishell.h +++ b/include/minishell.h @@ -6,7 +6,7 @@ /* By: mmoussou name, ft_strlen(env->name)); exec_env[i][ft_strlen(env->name)] = '='; - ft_strlcpy(exec_env[i] + ft_strlen(env->name) + 1, - env->content, ft_strlen(env->content)) + ft_strlcpy(exec_env[i] + ft_strlen(env->name) + 1, \ + env->content, ft_strlen(env->content)); env = env->next; i++; } diff --git a/src/main.c b/src/main.c index 3af378f..04da925 100644 --- a/src/main.c +++ b/src/main.c @@ -6,7 +6,7 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/04/24 11:18:04 by adjoly #+# #+# */ -/* Updated: 2024/04/29 13:35:58 by adjoly ### ########.fr */ +/* Updated: 2024/04/30 12:40:35 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ @@ -17,7 +17,6 @@ #include #include #include "minishell.h" -#include "libft.h" bool is_str(char *src, char *dst) { @@ -31,35 +30,34 @@ bool is_str(char *src, char *dst) return (true); } -char *get_hostname(void) +/*char *get_hostname(void) { char *hostname; char *tmp; int host_file; - host_file = open(); - read(); + //host_file = open(); tmp = hostname; while (*tmp) tmp++; return -} +}*/ char *get_prompt(void) { char **prompt; - char *ret; + char *ret = NULL; char *home; char **tmp; prompt = malloc(1000); prompt[0] = getenv("USER"); prompt[1] = "@"; - prompt[2] = get_hostname(); + //prompt[2] = get_hostname(); home = getenv("HOME"); prompt[3] = getenv("PWD"); prompt[4] = ">"; - ret = ft_calloc(1000, sizeof(char)); + //ret = ft_calloc(1000, sizeof(char)); if (!ft_strncmp(prompt[3], home, ft_strlen(home))) prompt[3] += ft_strlen(home); @@ -77,7 +75,7 @@ int main(int ac, char **av, char **env) { char *test; char **lll; - char *ret; + char *ret = NULL; (void)ac; (void)av; @@ -94,6 +92,6 @@ int main(int ac, char **av, char **env) if (is_str(test, "exit")) break; } - ft_freearr((void **)lll); + //ft_freearr((void **)lll); return (0); }