Still working on the exec part

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

View file

@ -13,21 +13,21 @@
#ifndef VEC_REDIR_H
#define VEC_REDIR_H
#include "exec/spawn_cmd/_redirection.h"
#include "exec/spawn_cmd/pprocess.h"
#include "me/types.h"
/// @brief A function that takes two t_exec_redirect and compare them
typedef bool (*t_vec_redir_sort_fn)(t_exec_redirect *, t_exec_redirect *);
/// @brief A function that free an t_exec_redirect
typedef void (*t_free_redir_item)(t_exec_redirect);
/// @brief A function that takes two t_p_redirection and compare them
typedef bool (*t_vec_redir_sort_fn)(t_p_redirection *, t_p_redirection *);
/// @brief A function that free an t_p_redirection
typedef void (*t_free_redir_item)(t_p_redirection);
/// @brief A dynamic array of t_exec_redirect
/// @brief A dynamic array of t_p_redirection
typedef struct s_vec_redir
{
t_free_redir_item free_func;
t_usize len;
t_usize capacity;
t_exec_redirect *buffer;
t_p_redirection *buffer;
} t_vec_redir;
/// @brief Create a new vec_redir with a given capacity
@ -37,19 +37,19 @@ t_vec_redir vec_redir_new(t_usize capacity, t_free_redir_item free_function);
/// @brief Push an element to the last position of the vec_redir
/// @param vec The vec_redir to push the element to
/// @param element The element to push
t_error vec_redir_push(t_vec_redir *vec, t_exec_redirect element);
t_error vec_redir_push(t_vec_redir *vec, t_p_redirection element);
/// @brief Push an element to the first position of the vec_redir
/// @param vec The vec_redir to push the element to
/// @param element The element to push
/// @note This operation is O(n)
t_error vec_redir_push_front(t_vec_redir *vec, t_exec_redirect element);
t_error vec_redir_push_front(t_vec_redir *vec, t_p_redirection element);
/// @brief Get the last element from the vec_redir, and remove it from the vec_redir
/// @param vec The vec_redir to get the element from
/// @param[out] out The last element of the vec_redir
/// @return true if the operation failed, false otherwise
t_error vec_redir_pop(t_vec_redir *vec, t_exec_redirect *value);
t_error vec_redir_pop(t_vec_redir *vec, t_p_redirection *value);
/// @brief Get the first element from the vec_redir, and remove it from the vec_redir
@ -57,7 +57,7 @@ t_error vec_redir_pop(t_vec_redir *vec, t_exec_redirect *value);
/// @param[out] out The first element of the vec_redir
/// @return true if the operation failed, false otherwise
/// @note This operation is O(n)
t_error vec_redir_pop_front(t_vec_redir *vec, t_exec_redirect *value);
t_error vec_redir_pop_front(t_vec_redir *vec, t_p_redirection *value);
/// @brief Free the vector and all its elements
/// @param vec The vec_redir to free
@ -73,7 +73,7 @@ t_error vec_redir_reserve(t_vec_redir *vec, t_usize wanted_capacity);
/// @param vec The vec_redir to search in
/// @param fn The function to run on each element
/// @param[out] index The index of the first element that returns true
t_error vec_redir_find(t_vec_redir *vec, bool (*fn)(const t_exec_redirect *), t_usize *index);
t_error vec_redir_find(t_vec_redir *vec, bool (*fn)(const t_p_redirection *), t_usize *index);
/// @brief Run the function and returns the index of the first element that returns true, but starting at index starting_index
@ -81,7 +81,7 @@ t_error vec_redir_find(t_vec_redir *vec, bool (*fn)(const t_exec_redirect *), t_
/// @param fn The function to run on each element
/// @param starting_index The index to start the search from
/// @param[out] index The index of the first element that returns true
t_error vec_redir_find_starting(t_vec_redir *vec, bool (*fn)(const t_exec_redirect *), t_usize starting_index, t_usize *index);
t_error vec_redir_find_starting(t_vec_redir *vec, bool (*fn)(const t_p_redirection *), t_usize starting_index, t_usize *index);
/// @brief Run the function on every element of the vec_redir and returns if all elements returned true
/// @param vec The vec_redir to search in
@ -89,7 +89,7 @@ t_error vec_redir_find_starting(t_vec_redir *vec, bool (*fn)(const t_exec_redire
/// @param[out] result The result of the operation
/// @return true if the operation failed, false otherwise
/// @note If the vec_redir is empty, result will be true
t_error vec_redir_all(t_vec_redir *vec, bool (*fn)(const t_exec_redirect *), bool *result);
t_error vec_redir_all(t_vec_redir *vec, bool (*fn)(const t_p_redirection *), bool *result);
/// @brief Run the function on every element of the vec_redir and returns if any element returned true
/// @param vec The vec_redir to search in
@ -97,13 +97,13 @@ t_error vec_redir_all(t_vec_redir *vec, bool (*fn)(const t_exec_redirect *), boo
/// @param[out] result The result of the operation
/// @return true if the operation failed, false otherwise
/// @note If the vec_redir is empty, result will be false
t_error vec_redir_any(t_vec_redir *vec, bool (*fn)(const t_exec_redirect *), bool *result);
t_error vec_redir_any(t_vec_redir *vec, bool (*fn)(const t_p_redirection *), bool *result);
/// @brief Run the function on every element of the vec_redir
/// @param vec The vec_redir to iterate over
/// @param fn The function to run on each element
/// @param state The state to pass to the function
void vec_redir_iter(t_vec_redir *vec, void (*fn)(t_usize index, t_exec_redirect *value, void *state), void *state);
void vec_redir_iter(t_vec_redir *vec, void (*fn)(t_usize index, t_p_redirection *value, void *state), void *state);
/// @brief Reverse the order of the elements in the vec_redir
/// @param vec The vec_redir to reverse
@ -118,6 +118,6 @@ void vec_redir_sort(t_vec_redir *vec, t_vec_redir_sort_fn is_sorted);
/// @param vec The vec_redir to get the element from
/// @param[out] out A pointer to the last element of the vec_redir
/// @return true if the operation failed, false otherwise
t_error vec_redir_back(t_vec_redir *vec, t_exec_redirect **out);
t_error vec_redir_back(t_vec_redir *vec, t_p_redirection **out);
#endif

View file

@ -22,14 +22,14 @@ t_vec_redir vec_redir_new(t_usize capacity,
out = (t_vec_redir){0};
out.free_func = free_function;
out.buffer = mem_alloc_array(capacity, sizeof(t_exec_redirect));
out.buffer = mem_alloc_array(capacity, sizeof(t_p_redirection));
if (out.buffer)
out.capacity = capacity;
return (out);
}
/// Return true in case of an error
t_error vec_redir_push(t_vec_redir *vec, t_exec_redirect element)
t_error vec_redir_push(t_vec_redir *vec, t_p_redirection element)
{
if (vec == NULL)
return (ERROR);
@ -52,7 +52,7 @@ t_error vec_redir_reserve(t_vec_redir *vec, t_usize wanted_capacity)
while (wanted_capacity > new_capacity)
new_capacity = (new_capacity * 3) / 2 + 1;
vec->buffer =
mem_realloc_array(vec->buffer, new_capacity, sizeof(t_exec_redirect));
mem_realloc_array(vec->buffer, new_capacity, sizeof(t_p_redirection));
vec->capacity = new_capacity;
}
return (NO_ERROR);
@ -60,10 +60,10 @@ t_error vec_redir_reserve(t_vec_redir *vec, t_usize wanted_capacity)
/// Return true if the vector is empty
/// This function is safe to call with value being NULL
t_error vec_redir_pop(t_vec_redir *vec, t_exec_redirect *value)
t_error vec_redir_pop(t_vec_redir *vec, t_p_redirection *value)
{
t_exec_redirect temp_value;
t_exec_redirect *ptr;
t_p_redirection temp_value;
t_p_redirection *ptr;
if (vec == NULL)
return (ERROR);
@ -74,7 +74,7 @@ t_error vec_redir_pop(t_vec_redir *vec, t_exec_redirect *value)
ptr = &temp_value;
vec->len--;
*ptr = vec->buffer[vec->len];
mem_set_zero(&vec->buffer[vec->len], sizeof(t_exec_redirect));
mem_set_zero(&vec->buffer[vec->len], sizeof(t_p_redirection));
return (NO_ERROR);
}

View file

@ -18,7 +18,7 @@
#include <stdlib.h>
t_error vec_redir_find(t_vec_redir *vec,
bool (*fn)(const t_exec_redirect *), t_usize *index)
bool (*fn)(const t_p_redirection *), t_usize *index)
{
t_usize idx;
@ -27,7 +27,7 @@ t_error vec_redir_find(t_vec_redir *vec,
idx = 0;
while (idx < vec->len)
{
if (fn((const t_exec_redirect *)&vec->buffer[idx]))
if (fn((const t_p_redirection *)&vec->buffer[idx]))
{
*index = idx;
return (NO_ERROR);
@ -38,7 +38,7 @@ t_error vec_redir_find(t_vec_redir *vec,
}
t_error vec_redir_find_starting(t_vec_redir *vec,
bool (*fn)(const t_exec_redirect *),
bool (*fn)(const t_p_redirection *),
t_usize starting_index, t_usize *index)
{
t_usize idx;
@ -48,7 +48,7 @@ t_error vec_redir_find_starting(t_vec_redir *vec,
idx = starting_index;
while (idx < vec->len)
{
if (fn((const t_exec_redirect *)&vec->buffer[idx]))
if (fn((const t_p_redirection *)&vec->buffer[idx]))
{
*index = idx;
return (NO_ERROR);
@ -59,7 +59,7 @@ t_error vec_redir_find_starting(t_vec_redir *vec,
}
t_error vec_redir_all(t_vec_redir *vec,
bool (*fn)(const t_exec_redirect *), bool *result)
bool (*fn)(const t_p_redirection *), bool *result)
{
t_usize idx;
@ -69,7 +69,7 @@ t_error vec_redir_all(t_vec_redir *vec,
*result = true;
while (*result && idx < vec->len)
{
if (!fn((const t_exec_redirect *)&vec->buffer[idx]))
if (!fn((const t_p_redirection *)&vec->buffer[idx]))
*result = false;
idx++;
}
@ -77,7 +77,7 @@ t_error vec_redir_all(t_vec_redir *vec,
}
t_error vec_redir_any(t_vec_redir *vec,
bool (*fn)(const t_exec_redirect *), bool *result)
bool (*fn)(const t_p_redirection *), bool *result)
{
t_usize idx;
@ -87,7 +87,7 @@ t_error vec_redir_any(t_vec_redir *vec,
*result = false;
while (*result && idx < vec->len)
{
if (fn((const t_exec_redirect *)&vec->buffer[idx]))
if (fn((const t_p_redirection *)&vec->buffer[idx]))
*result = true;
idx++;
}
@ -95,7 +95,7 @@ t_error vec_redir_any(t_vec_redir *vec,
}
void vec_redir_iter(t_vec_redir *vec,
void (*fn)(t_usize index, t_exec_redirect *value,
void (*fn)(t_usize index, t_p_redirection *value,
void *state),
void *state)
{

View file

@ -18,7 +18,7 @@
#include <stdlib.h>
t_error vec_redir_push_front(t_vec_redir *vec,
t_exec_redirect element)
t_p_redirection element)
{
t_usize i;
@ -39,7 +39,7 @@ t_error vec_redir_push_front(t_vec_redir *vec,
return (NO_ERROR);
}
t_error vec_redir_pop_front(t_vec_redir *vec, t_exec_redirect *value)
t_error vec_redir_pop_front(t_vec_redir *vec, t_p_redirection *value)
{
t_usize i;
@ -59,7 +59,7 @@ t_error vec_redir_pop_front(t_vec_redir *vec, t_exec_redirect *value)
void vec_redir_reverse(t_vec_redir *vec)
{
t_exec_redirect temporary;
t_p_redirection temporary;
t_usize i;
i = 0;
@ -72,9 +72,9 @@ void vec_redir_reverse(t_vec_redir *vec)
}
}
t_error vec_redir_back(t_vec_redir *vec, t_exec_redirect **out)
t_error vec_redir_back(t_vec_redir *vec, t_p_redirection **out)
{
t_exec_redirect *temporary;
t_p_redirection *temporary;
if (out == NULL)
out = &temporary;