Alpha

.gitignore

@@ -0,0 +1,4 @@
+.vscode
+a.out
+a.out.dSYM/
+.DS_Store

mini_imane/builtins_call.c → mini_imane/commands_call.c

@@ -1,12 +1,12 @@
 /* ************************************************************************** */
 /*                                                                            */
 /*                                                        :::      ::::::::   */
-/*   builtins_call.c                                    :+:      :+:    :+:   */
+/*   commands_call.c                                    :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
 /*   By: irhesri <irhesri@student.42.fr>            +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2022/08/07 21:09:53 by irhesri           #+#    #+#             */
-/*   Updated: 2022/08/11 12:46:11 by irhesri          ###   ########.fr       */
+/*   Updated: 2022/08/12 11:54:22 by irhesri          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -20,30 +20,30 @@ void	print_arg(char **arg)
 	}
 
 }
-void	builtins_call(t_data *data, char **arg)
+void	commands_call(t_data *data, char **arg)
 {
 	int			i;
 	short		b;
 	static void	(*ptr[8])();
-	static char	*call[10] = {"echo", "pwd", "cd", "exit", "env", "export", "unset"};
+	static char	*call[10] = {"export", "unset", "exit", "cd", "env", "echo", "pwd"};
 
 	if (!ptr[0])
 	{
-		ptr[0] = print_arg;
-		// ptr[1] = echo;
-		// ptr[2] = pwd;
-		// ptr[3] = cd;
-		ptr[4] = env;
-		// ptr[5] = exit;
-		ptr[6] = export;
-		ptr[7] = unset;
+		ptr[0] = not_builtin;
+		ptr[1] = export;
+		ptr[2] = unset;
+		// ptr[3] = exit;
+		// ptr[4] = cd;
+		ptr[5] = env;
+		// ptr[6] = echo;
+		// ptr[7] = pwd;
 	}
 	b = 0;
 	i = -1;
 	while (!b && arg && ++i < 8)
 		b = !ft_strncmp(call[i], *arg, 10) * (i + 1);
-	if (b > 4 && arg)
-		ptr[b](data, arg + 1);
+	if (b < 5 && arg)
+		ptr[b](data, arg + (b != 0));
 	else
-		ptr[b](arg + (b != 0));
+		ptr[b](arg + 1);
 }

mini_imane/main.c

@@ -6,7 +6,7 @@
 /*   By: irhesri <irhesri@student.42.fr>            +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2022/08/07 21:10:34 by irhesri           #+#    #+#             */
-/*   Updated: 2022/08/08 13:02:44 by irhesri          ###   ########.fr       */
+/*   Updated: 2022/08/11 13:47:55 by irhesri          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -27,7 +27,7 @@ int	main(int ac, char **av, char **envp)
 		parse_time (data, str);
 		print_pipes(data, data->pipes);
 		free (str);
-		builtins_call(data, ((t_pipe *)(((data->pipes)->head)->content))->arg);
+		commands_call(data, ((t_pipe *)(((data->pipes)->head)->content))->arg);
 		empty_pipes(data->pipes);
 	}
 }

mini_imane/not_builtin.c

@@ -0,0 +1,83 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   not_builtin.c                                      :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: irhesri <irhesri@student.42.fr>            +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2022/08/11 13:48:26 by irhesri           #+#    #+#             */
+/*   Updated: 2022/08/12 11:50:47 by irhesri          ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "../minishell.h"
+
+// short	open_file(char *path, char *command)
+// {
+// 	if (access(path, F_OK) != -1)
+// 	{
+// 		if (access(path, X_OK) != -1 && access(path, R_OK) != -1)
+// 			return (1);
+// 		// bash: command: Permission denied
+// 		exit (126);
+// 	}
+// 	return (127);
+// }
+
+// char	*first_check(char *command)
+// {
+// 	struct stat	file_mode;
+
+// 	stat(command, &file_mode);
+// 	if (file_mode.st_mode == S_IFDIR)
+// 	{
+// 		// bash: command: is a directory
+// 		exit(126);
+// 	}
+// 	if (my_search(command, '/') != -1 && open_file(command, command) == 1)
+// 		return (command);
+// 	return (NULL);
+// }
+
+// char	*get_path(char *command)
+// {
+// 	char		*path;
+// 	char		**env_paths;
+
+// 	path = first_check(command);
+// 	if (path)
+// 		return (path);
+// 	if (my_search(command, '/') == -1 && *command)
+// 	{
+// 		path = my_getenv(command);
+// 		env_paths = my_split(path, ':', 1);
+// 		free(path);
+// 		if (!env_paths && open_file(command, command) == 1)
+// 			return (command);
+// 		while (env_paths && *env_paths)
+// 		{
+// 			path = free_join(*env_paths, command, 1);
+// 			// add / to the join
+// 			if (open_file(path, *command) == 1)
+// 			{
+// 				while (*(++env_paths))
+// 					free (*env_paths);
+// 				free(env_paths);
+// 				return (path);
+// 			}
+// 		}
+// 		free(env_paths);
+// 	}
+// 	// bash: command: No such file or directory
+// 	exit (127);
+// }
+
+void	not_builtin(t_data *data, char **arg)
+{
+	char	*path;
+
+// 	path = get_path(*arg);
+// 	update_envp(data);
+// 	execve(path, arg, data->envp);
+// 	perror(*arg);
+}