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

Still working on the exec part

Browse source
This commit is contained in:
Maieul BOYER 2024-07-30 17:16:28 +02:00
parent 9b1574b9c4
commit e5498d92bc
No known key found for this signature in database
12 changed files with 123 additions and 178 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,62 +0,0 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* _redirection.h :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/07/29 17:24:19 by maiboyer #+# #+# */
/* Updated: 2024/07/30 15:56:33 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
#ifndef _REDIRECTION_H
# define _REDIRECTION_H
# include "me/types.h"
# include "me/fs/fs.h"
typedef union u_exec_redirect t_exec_redirect;
enum e_exec_redirect_kind
{
EXEC_REDIR_FD,
EXEC_REDIR_HEREDOC,
EXEC_REDIR_PIPE,
};
union u_exec_redirect
{
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((void *)self.fd.file_path), 1));
if (self.kind == EXEC_REDIR_HEREDOC)
(void)(self.heredoc.data != NULL && (mem_free((void *)self.heredoc.data), 1));
}
#endif /* _REDIRECTION_H */

8
exec/include/exec/spawn_cmd/pipe.h → exec/include/exec/spawn_cmd/ppipe.h
View file

@ -1,17 +1,17 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* pipe.h :+: :+: :+: */
/* ppipe.h :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/01/04 17:57:29 by maiboyer #+# #+# */
/* Updated: 2024/07/30 14:33:50 by maiboyer ### ########.fr */
/* Updated: 2024/07/30 17:03:32 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
#ifndef PIPE_H
#define PIPE_H
#ifndef PPIPE_H
#define PPIPE_H
#include "me/fs/fs.h"
#include "me/types.h"

81
exec/include/exec/spawn_cmd/process.h → exec/include/exec/spawn_cmd/pprocess.h
View file

@ -1,17 +1,17 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* process.h :+: :+: :+: */
/* pprocess.h :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/01/03 15:43:08 by maiboyer #+# #+# */
/* Updated: 2024/07/30 16:28:05 by maiboyer ### ########.fr */
/* Updated: 2024/07/30 17:06:38 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
#ifndef PROCESS_H
#define PROCESS_H
#ifndef PPROCESS_H
#define PPROCESS_H
#include "me/fs/fs.h"
#include "me/types.h"
@ -21,87 +21,90 @@
typedef t_i32 t_pid;
typedef t_i32 t_exit_code;
enum e_redirection
enum e_p_redirection
{
R_INHERITED = 0,
R_PIPED = 1,
R_FD = 2,
PR_INHERITED = 0,
PR_PIPED = 1,
PR_FD = 2,
};
union u_redirection {
struct s_fd_redirection
union u_p_redirection {
struct s_pfd_redirection
{
t_fd *value;
} fd;
struct s_piped_redirection
struct s_ppiped_redirection
{
} piped;
struct s_inherited_redirection
struct s_pinherited_redirection
{
} inherited;
};
/// @brief Redirection for spawning a process
typedef struct s_process_redirection
typedef struct s_p_redirection
{
enum e_redirection tag;
union u_redirection vals;
} t_redirection;
enum e_p_redirection tag;
union u_p_redirection vals;
} t_p_redirection;
/// @brief Create a piped redirection
/// @param void
/// @return the redirection
static inline t_redirection piped(void)
static inline t_p_redirection ppiped(void)
{
return ((t_redirection){
.tag = R_PIPED,
return ((t_p_redirection){
.tag = PR_PIPED,
});
}
/// @brief Create an inherited redirection (inherit from the parent process)
/// @param void
/// @return the redirection
static inline t_redirection inherited(void)
static inline t_p_redirection pinherited(void)
{
return ((t_redirection){
.tag = R_INHERITED,
return ((t_p_redirection){
.tag = PR_INHERITED,
});
}
/// @brief Create a file descriptor redirection
/// @param fd file descriptor to redirect
/// @return the redirection
static inline t_redirection fd(t_fd *fd)
static inline t_p_redirection pfd(t_fd *fd)
{
return ((t_redirection){.tag = R_FD,
.vals = (union u_redirection){
.fd = {.value = fd},
}});
return ((t_p_redirection){.tag = PR_FD,
.vals = (union u_p_redirection){
.fd = {.value = fd},
}});
}
/// @brief Spawn information
typedef struct s_exec_spawn_info
typedef struct s_p_spawn_info
{
t_redirection stdin;
t_redirection stdout;
t_redirection stderr;
t_vec_str arguments;
t_vec_str environement;
t_str binary_path;
t_p_redirection stdin;
t_p_redirection stdout;
t_p_redirection stderr;
t_vec_str arguments;
t_vec_str environement;
t_str binary_path;
void (*forked_free)(void *);
void *forked_free_args;
} t_exec_spawn_info;
} t_p_spawn_info;
/// @brief Process information
typedef struct s_process
typedef struct s_p_process
{
t_pid pid;
} t_exec_process;
t_fd *stdin;
t_fd *stderr;
t_fd *stdout;
t_pid pid;
} t_p_process;
/// @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_exec_spawn_info info, t_exec_process *process);
t_error pspawn_process(t_p_spawn_info info, t_p_process *process);
#endif /* PROCESS_H */