raphael/minishell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated Filelist

Browse source
This commit is contained in:
Maieul BOYER 2024-07-30 14:54:11 +02:00
parent ed4015a8fe
commit f05826942a
No known key found for this signature in database
15 changed files with 182 additions and 163 deletions
Download patch file Download diff file Expand all files Collapse all files

5
exec/Filelist.exec.mk
View file

@ -1,4 +1,9 @@
SRC_FILES = \
arith/arith \
arith/arith_operation \
run_ast \
spawn_cmd/handle_redirection \
spawn_cmd/iter_funcs \
spawn_cmd/pipe \
spawn_cmd/process \

61
exec/include/exec/spawn_cmd/_redirection.h
View file

@ -6,44 +6,57 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/07/29 17:24:19 by maiboyer #+# #+# */
/* Updated: 2024/07/29 19:09:56 by maiboyer ### ########.fr */
/* Updated: 2024/07/30 14:30:45 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
#ifndef _REDIRECTION_H
#define _REDIRECTION_H
# define _REDIRECTION_H
#include "me/types.h"
# include "me/types.h"
# include "me/fs/fs.h"
typedef struct s_exec_redirect t_exec_redirect;
typedef struct s_exec_redirect_fd t_exec_redirect_fd;
typedef struct s_exec_redirect_heredoc t_exec_redirect_heredoc;
typedef union u_exec_redirect t_exec_redirect;
struct s_exec_redirect_heredoc
{
};
struct s_exec_redirect_fd
{
int infile_fd;
int outfile_fd;
t_str file_path;
};
union u_exec_redirect_data {
t_exec_redirect_heredoc heredoc;
t_exec_redirect_fd fd;
};
enum e_exec_redirect_kind
{
EXEC_REDIR_FD,
EXEC_REDIR_HEREDOC,
EXEC_REDIR_PIPE,
};
struct s_exec_redirect
union u_exec_redirect
{
union u_exec_redirect_data data;
enum e_exec_redirect_kind kind;
enum e_exec_redirect_kind kind;
struct s_exec_redirect_heredoc
{
enum e_exec_redirect_kind kind;
int in_fd;
t_const_str data;
} heredoc;
struct s_exec_redirect_fd
{
enum e_exec_redirect_kind kind;
int lhs_fd;
int rhs_fd;
t_const_str file_path;
} fd;
struct s_exec_redirect_pipe
{
enum e_exec_redirect_kind kind;
int stdin;
int stdout;
} piped;
};
static inline void free_redirection(t_exec_redirect self)
{
void mem_free(void *ptr);
if (self.kind == EXEC_REDIR_FD)
(void)(self.fd.file_path != NULL && (mem_free(self.fd.file_path), 1));
if (self.kind == EXEC_REDIR_HEREDOC)
(void)(self.heredoc.data != NULL && (mem_free(self.heredoc.data), 1));
}
#endif /* _REDIRECTION_H */

17
exec/include/exec/spawn_cmd/pipe.h
View file

@ -6,25 +6,26 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/01/04 17:57:29 by maiboyer #+# #+# */
/* Updated: 2024/01/04 17:59:30 by maiboyer ### ########.fr */
/* Updated: 2024/07/30 14:33:50 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
#ifndef PIPE_H
# define PIPE_H
#define PIPE_H
# include "me/types.h"
#include "me/fs/fs.h"
#include "me/types.h"
/// @brief Pipe structure
typedef struct s_pipe
typedef struct s_exec_pipe
{
int read;
int write;
} t_pipe;
t_fd *read;
t_fd *write;
} t_exec_pipe;
/// @brief Create a pipe
/// @param[out] out the created pipe
/// @return the error
t_error create_pipe(t_pipe *out);
t_error create_pipe(t_exec_pipe *out);
#endif /* PIPE_H */

124
exec/include/exec/spawn_cmd/process.h
View file

@ -6,37 +6,36 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/01/03 15:43:08 by maiboyer #+# #+# */
/* Updated: 2024/07/11 18:59:04 by maiboyer ### ########.fr */
/* Updated: 2024/07/30 13:23:00 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
#ifndef PROCESS_H
# define PROCESS_H
#define PROCESS_H
# include "me/types.h"
# include "me/vec/vec_str.h"
# include "me/vec/vec_u8.h"
#include "me/types.h"
#include "me/vec/vec_str.h"
#include "me/vec/vec_u8.h"
typedef t_i32 t_pid;
typedef t_i32 t_exit_code;
typedef t_i32 t_pid;
typedef t_i32 t_exit_code;
enum e_redirection
enum e_redirection
{
R_INHERITED = 0,
R_PIPED = 1,
R_FD = 2,
};
union u_redirection
{
struct s_fd_redirection
union u_redirection {
struct s_fd_redirection
{
int value;
int value;
} fd;
struct s_piped_redirection
struct s_piped_redirection
{
} piped;
struct s_inherited_redirection
struct s_inherited_redirection
{
} inherited;
};
@ -44,14 +43,14 @@ union u_redirection
/// @brief Redirection for spawning a process
typedef struct s_redirection
{
enum e_redirection tag;
union u_redirection vals;
} t_redirection;
enum e_redirection tag;
union u_redirection vals;
} t_redirection;
/// @brief Create a piped redirection
/// @param void
/// @return the redirection
static inline t_redirection piped(void)
static inline t_redirection piped(void)
{
return ((t_redirection){
.tag = R_PIPED,
@ -61,7 +60,7 @@ static inline t_redirection piped(void)
/// @brief Create an inherited redirection (inherit from the parent process)
/// @param void
/// @return the redirection
static inline t_redirection inherited(void)
static inline t_redirection inherited(void)
{
return ((t_redirection){
.tag = R_INHERITED,
@ -71,16 +70,16 @@ static inline t_redirection inherited(void)
/// @brief Create a file descriptor redirection
/// @param fd file descriptor to redirect
/// @return the redirection
static inline t_redirection fd(int fd)
static inline t_redirection fd(int fd)
{
return ((t_redirection){.tag = R_FD, \
.vals = (union u_redirection){\
.fd = {.value = fd}, \
return ((t_redirection){.tag = R_FD,
.vals = (union u_redirection){
.fd = {.value = fd},
}});
}
/// @brief Wrapped file descriptor tag
enum e_wrapped_fd_tag
enum e_wrapped_fd_tag
{
READ_ONLY,
WRITE_ONLY,
@ -89,85 +88,82 @@ enum e_wrapped_fd_tag
};
/// @brief Wrapped file descriptor
union u_wrapped_fd
{
struct s_read_only
union u_wrapped_fd {
struct s_read_only
{
int fd;
int fd;
} ro;
struct s_write_only
struct s_write_only
{
int fd;
int fd;
} wo;
struct s_read_write
struct s_read_write
{
int fd;
int fd;
} rw;
};
/// @brief Wrapped file descriptor
typedef struct s_wrapped_fd
{
enum e_wrapped_fd_tag tag;
union u_wrapped_fd vals;
} t_wrapped_fd;
enum e_wrapped_fd_tag tag;
union u_wrapped_fd vals;
} t_wrapped_fd;
/// @brief Create a Read only wrapped file descriptor
/// @param fd file descriptor to wrap
/// @return the wrapped file descriptor
static inline t_wrapped_fd ro(int fd)
static inline t_wrapped_fd ro(int fd)
{
return ((t_wrapped_fd){.tag = READ_ONLY, \
.vals = (union u_wrapped_fd){\
.ro = {.fd = fd}, \
}});
return ((t_wrapped_fd){.tag = READ_ONLY,
.vals = (union u_wrapped_fd){
.ro = {.fd = fd},
}});
}
/// @brief Create a Write only wrapped file descriptor
/// @param fd file descriptor to wrap
/// @return the wrapped file descriptor
static inline t_wrapped_fd wo(int fd)
static inline t_wrapped_fd wo(int fd)
{
return ((t_wrapped_fd){.tag = WRITE_ONLY,
.vals = (union u_wrapped_fd){.wo = {.fd = fd}}});
return ((t_wrapped_fd){.tag = WRITE_ONLY, .vals = (union u_wrapped_fd){.wo = {.fd = fd}}});
}
/// @brief Spawn information
typedef struct s_spawn_info
{
t_redirection stdin;
t_redirection stdout;
t_redirection stderr;
t_vec_str arguments;
t_vec_str environement;
t_str binary_path;
void (*forked_free)(void *);
void *forked_free_args;
} t_spawn_info;
t_redirection stdin;
t_redirection stdout;
t_redirection stderr;
t_vec_str arguments;
t_vec_str environement;
t_str binary_path;
void (*forked_free)(void *);
void *forked_free_args;
} t_spawn_info;
/// @brief Process information
typedef struct s_process
{
t_wrapped_fd stdin;
t_wrapped_fd stdout;
t_wrapped_fd stderr;
t_pid pid;
} t_process;
t_wrapped_fd stdin;
t_wrapped_fd stdout;
t_wrapped_fd stderr;
t_pid pid;
} t_process;
/// @struct Process output
/// @brief Process output information
typedef struct s_process_output
{
t_pid pid;
t_vec_u8 stdout;
t_vec_u8 stderr;
t_exit_code exit_code;
} t_process_output;
t_pid pid;
t_vec_u8 stdout;
t_vec_u8 stderr;
t_exit_code exit_code;
} t_process_output;
/// @brief Spawn a new process with the given information
/// @param info the information to spawn the process
/// @param process data returned by the function
/// @return true if an error occured, false otherwise
t_error spawn_process(t_spawn_info info,
t_process *process);
t_error spawn_process(t_spawn_info info, t_process *process);
#endif /* PROCESS_H */

5
exec/src/run_ast.c
View file

@ -6,7 +6,7 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/07/11 17:22:29 by maiboyer #+# #+# */
/* Updated: 2024/07/29 19:04:56 by maiboyer ### ########.fr */
/* Updated: 2024/07/30 14:52:09 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
@ -26,6 +26,7 @@
#include <stdio.h>
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunused-parameter"
#pragma clang diagnostic ignored "-Wunused-variable"
@ -728,3 +729,5 @@ t_error run_node(t_ast_node self, t_state *state, void *out)
}
*/
#pragma clang diagnostic pop

5
exec/src/spawn_cmd/process_inner.c → exec/src/spawn_cmd/handle_redirection.c
View file

@ -1,12 +1,12 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* process_inner.c :+: :+: :+: */
/* handle_redirection.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/01/04 22:27:00 by maiboyer #+# #+# */
/* Updated: 2024/07/29 19:05:38 by maiboyer ### ########.fr */
/* Updated: 2024/07/30 14:53:11 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
@ -16,4 +16,5 @@
t_error handle_redirections(t_spawn_info *info, t_process *process)
{
return (ERROR);
}

25
exec/src/spawn_cmd/process_iter_funcs.c → exec/src/spawn_cmd/iter_funcs.c
View file

@ -1,12 +1,12 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* process_iter_funcs.c :+: :+: :+: */
/* iter_funcs.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/01/04 22:25:44 by maiboyer #+# #+# */
/* Updated: 2024/07/29 17:22:42 by maiboyer ### ########.fr */
/* Updated: 2024/07/30 13:22:34 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
@ -14,28 +14,17 @@
#include <stdbool.h>
#include <stdio.h>
bool exec_find_null(const t_str *s)
bool exec_find_null(const t_str *s)
{
return (s == NULL);
}
bool exec_str_start_with(t_const_str s, t_const_str prefix)
bool exec_find_path(const t_str *s)
{
while (*prefix && *s)
{
if (*prefix++ != *s++)
return (false);
}
return (*prefix == '\0');
}
bool exec_find_path(const t_str *s)
{
t_str ss;
t_str str;
if (*s == NULL)
return (false);
ss = *s;
return (ss[0] == 'P' && ss[1] == 'A' && ss[2] == 'T' && ss[3] == 'H' && \
ss[4] == '=');
str = *s;
return (str[0] == 'P' && str[1] == 'A' && str[2] == 'T' && str[3] == 'H' && str[4] == '=');
}

26
exec/src/spawn_cmd/pipe.c
View file

@ -6,19 +6,33 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/01/04 17:59:48 by maiboyer #+# #+# */
/* Updated: 2024/07/29 19:05:12 by maiboyer ### ########.fr */
/* Updated: 2024/07/30 14:48:48 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
#include "exec/spawn_cmd/pipe.h"
#include "me/fs/fs.h"
#include "me/str/str.h"
t_error exec_create_pipe(t_pipe *out)
t_error exec_create_pipe(t_exec_pipe *out)
{
int fds[2];
int fd[2];
struct s_file_slot *read;
struct s_file_slot *write;
if (pipe(fds))
if (pipe(fd))
return (ERROR);
out->read = fds[0];
out->write = fds[1];
read = get_unused_fd_slot();
if (read == NULL)
return (close(fd[0]), close(fd[1]), ERROR);
read->ty = SLOT_FD;
write = get_unused_fd_slot();
if (write == NULL)
return (read->ty = SLOT_UNUSED, close(fd[0]), close(fd[1]), ERROR);
write->ty = SLOT_FD;
read->slot.fd = (t_fd){.fd = fd[0], .type = FD_PIPE, .name = str_clone("<pipe[R]>"), .perms = FD_READ};
read->slot.fd = (t_fd){.fd = fd[1], .type = FD_PIPE, .name = str_clone("<pipe[W]>"), .perms = FD_WRITE};
out->read = &read->slot.fd;
out->write = &write->slot.fd;
return (NO_ERROR);
}

9
exec/src/spawn_cmd/process.c
View file

@ -6,13 +6,13 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/01/03 16:22:41 by maiboyer #+# #+# */
/* Updated: 2024/07/29 19:06:23 by maiboyer ### ########.fr */
/* Updated: 2024/07/30 13:22:17 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
#include "exec/spawn_cmd/process.h"
#include "exec/spawn_cmd/pipe.h"
#include "me/mem/mem.h"
#include "me/os/pipe.h"
#include "me/printf/printf.h"
#include "me/str/str.h"
#include "me/string/string.h"
@ -25,7 +25,6 @@
bool exec_find_path(const t_str *s);
bool exec_find_null(const t_str *s);
bool exec_str_start_with(t_const_str s, t_const_str prefix);
t_error exec_handle_redirections(t_spawn_info *info, t_process *process);
t_error exec_spawn_process_exec(t_spawn_info info, t_process *process)
@ -40,7 +39,7 @@ t_error exec_spawn_process_exec(t_spawn_info info, t_process *process)
if (!vec_str_any(&info.environement, exec_find_null, &res) && res)
vec_str_push(&info.environement, NULL);
execve(info.binary_path, info.arguments.buffer, info.environement.buffer);
return (NO_ERROR);
return (ERROR);
}
t_error exec_in_path(t_spawn_info *info, t_process *process, t_const_str path_raw, t_string *s)
@ -71,7 +70,7 @@ t_error exec_find_binary(t_spawn_info *info, t_process *process)
if (info->binary_path == NULL)
return (ERROR);
s = string_new(256);
if (exec_str_start_with(info->binary_path, "/") || str_find_chr(info->binary_path, '/') != NULL)
if (info->binary_path[0] == '/' || str_find_chr(info->binary_path, '/') != NULL)
string_push(&s, info->binary_path);
else
{