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

update

Browse source
This commit is contained in:
Maix0 2024-05-24 15:28:30 +02:00
parent 6d83a2c196
commit b1cfc0ee71
31 changed files with 133 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

2
stdme/include/me/fs/close.h
View file

@ -15,6 +15,6 @@
# include "me/types.h"
bool me_close(t_file file, t_i32 *error);
bool me_close(int file, t_i32 *error);
#endif

69
stdme/include/me/fs/fs.h
View file

@ -6,7 +6,7 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/05/19 15:12:18 by maiboyer #+# #+# */
/* Updated: 2024/05/19 17:08:38 by maiboyer ### ########.fr */
/* Updated: 2024/05/24 15:03:40 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
@ -15,10 +15,11 @@
#include "me/types.h"
#include <dirent.h>
#include <fcntl.h>
#include <stdio.h>
#include <sys/types.h>
#if !defined(FILE_SLOT_LEN) || FILE_SLOT_LEN < 64
#if (!defined(FILE_SLOT_LEN)) || FILE_SLOT_LEN < 64
# ifdef FILE_SLOT_LEN
# undef FILE_SLOT_LEN
# endif
@ -47,9 +48,37 @@ typedef enum e_fd_perm
FD_WRITE = 1 << 1,
} t_fd_perm;
typedef enum e_file_open_option
{
FD_CREATE = O_CREAT,
FD_EXCLUSIVE = O_EXCL,
FD_CLOSE_ON_EXEC = O_CLOEXEC,
FD_TRUNCATE = O_TRUNC,
FD_NON_BLOCKING = O_NONBLOCK,
} t_file_open_option;
typedef enum e_file_perm
{
FP_OEXEC = 1 << 0,
FP_OWRITE = 1 << 1,
FP_OREAD = 1 << 2,
FP_GEXEC = 1 << 3,
FP_GWRITE = 1 << 3,
FP_GREAD = 1 << 5,
FP_UEXEC = 1 << 6,
FP_UWRITE = 1 << 7,
FP_UREAD = 1 << 8,
FP_ALL_READ = FP_UREAD | FP_GREAD | FP_OREAD,
FP_ALL_WRITE = FP_UWRITE | FP_GWRITE | FP_OWRITE,
FP_ALL_EXEC = FP_UEXEC | FP_GEXEC | FP_OEXEC,
FP_DEFAULT = FP_UWRITE | FP_ALL_READ,
FP_DEFAULT_EXEC = FP_UWRITE | FP_ALL_EXEC | FP_ALL_READ,
} t_file_perm;
typedef struct s_fd
{
char *name;
t_str name;
int fd;
t_fd_perm perms;
t_fd_type type;
@ -58,19 +87,19 @@ typedef struct s_fd
typedef struct s_dir
{
DIR *ptr;
char *name;
t_str name;
} t_dir;
typedef struct s_file_data
typedef struct s_file
{
FILE *ptr;
char *name;
} t_file_data;
t_str name;
} t_file;
union u_file_slot {
t_fd fd;
t_dir dir;
t_file_data file;
t_fd fd;
t_dir dir;
t_file file;
};
struct s_file_slot
@ -84,8 +113,26 @@ typedef struct s_fd_array
struct s_file_slot storage[FILE_SLOT_LEN];
} t_fd_array;
typedef struct stat t_stat;
typedef struct dirent *t_dir_entry;
/// @brief Get the fd arrays object
/// @return fd_arrays
/// @note internal function used to get the fd arrays
t_fd_array *get_fd_arrays(void);
struct s_file_slot *get_unused_fd_slot(void);
void close_all_fds(void);
void close_all_slots(void);
void close_slot(struct s_file_slot *slot);
t_fd *open_fd(t_str name, t_fd_perm perms, t_file_open_option open_options,
t_file_perm file_perm);
t_error read_fd(t_fd *fd, t_u8 *buffer, t_usize size, t_isize *read_count);
t_error write_fd(t_fd *fd, t_u8 *buffer, t_usize size, t_isize *read_count);
t_error stat_fd(t_fd *fd, t_stat *stat);
void close_fd(t_fd *fd);
t_error open_dir(t_str name, t_dir *dir);
t_error read_dir(t_dir *dir, t_dir_entry *out);
t_error close_dir(t_dir *dir);
#endif /* FS_H */

6
stdme/include/me/fs/open.h
View file

@ -15,8 +15,8 @@
# include "me/types.h"
t_error me_open(t_const_str path, bool read, bool write, t_file *file_out);
t_error me_open_truncate(t_const_str path, t_file *file_out);
t_error me_open_create(t_const_str path, t_file *file_out);
t_error me_open(t_const_str path, bool read, bool write, int *file_out);
t_error me_open_truncate(t_const_str path, int *file_out);
t_error me_open_create(t_const_str path, int *file_out);
#endif

2
stdme/include/me/fs/putchar_fd.h
View file

@ -15,6 +15,6 @@
# include "me/types.h"
void me_putchar_fd(char chr, t_file file);
void me_putchar_fd(char chr, int file);
#endif

2
stdme/include/me/fs/putendl_fd.h
View file

@ -15,6 +15,6 @@
# include "me/types.h"
void me_putendl_fd(t_str str, t_file file);
void me_putendl_fd(t_str str, int file);
#endif

2
stdme/include/me/fs/putnbr_fd.h
View file

@ -15,6 +15,6 @@
# include "me/types.h"
void me_putnbr_fd(t_i32 n, t_file file);
void me_putnbr_fd(t_i32 n, int file);
#endif

2
stdme/include/me/fs/putstr_fd.h
View file

@ -15,6 +15,6 @@
# include "me/types.h"
void me_putstr_fd(t_str str, t_file file);
void me_putstr_fd(t_str str, int file);
#endif

2
stdme/include/me/fs/read.h
View file

@ -15,6 +15,6 @@
# include "me/types.h"
t_usize me_read(t_file fd, t_u8 *buffer, t_i64 buffer_max, bool *eof_out);
t_usize me_read(int fd, t_u8 *buffer, t_i64 buffer_max, bool *eof_out);
#endif

2
stdme/include/me/fs/write.h
View file

@ -15,6 +15,6 @@
# include "me/types.h"
bool me_write(t_file fd, t_u8 *buffer, t_i64 size);
bool me_write(int fd, t_u8 *buffer, t_i64 size);
#endif

4
stdme/include/me/gnl/gnl.h
View file

@ -26,7 +26,7 @@
typedef struct s_static_buffer
{
t_file fd;
int fd;
bool used;
char buf[BUFFER_SIZE + 1];
bool init;
@ -38,6 +38,6 @@ typedef struct s_copy_flags
bool empty_read;
} t_copy_flags;
t_string get_next_line(t_file fd, bool *error);
t_string get_next_line(int fd, bool *error);
#endif

4
stdme/include/me/os/pipe.h
View file

@ -18,8 +18,8 @@
/// @brief Pipe structure
typedef struct s_pipe
{
t_file read;
t_file write;
int read;
int write;
} t_pipe;
/// @brief Create a pipe

14
stdme/include/me/os/process.h
View file

@ -31,7 +31,7 @@ union u_redirection
{
struct s_fd
{
t_file value;
int value;
} fd;
struct s_piped
{
@ -71,7 +71,7 @@ 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(t_file fd)
static inline t_redirection fd(int fd)
{
return ((t_redirection){.tag = R_FD, \
.vals = (union u_redirection){.fd = {.value = fd},}});
@ -91,15 +91,15 @@ union u_wrapped_fd
{
struct s_read_only
{
t_file fd;
int fd;
} ro;
struct s_write_only
{
t_file fd;
int fd;
} wo;
struct s_read_write
{
t_file fd;
int fd;
} rw;
};
@ -113,7 +113,7 @@ typedef struct s_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(t_file fd)
static inline t_wrapped_fd ro(int fd)
{
return ((t_wrapped_fd){.tag = READ_ONLY,
.vals = (union u_wrapped_fd){
@ -124,7 +124,7 @@ static inline t_wrapped_fd ro(t_file 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(t_file fd)
static inline t_wrapped_fd wo(int fd)
{
return ((t_wrapped_fd){.tag = WRITE_ONLY,
.vals = (union u_wrapped_fd){.wo = {.fd = fd}}});

2
stdme/include/me/printf/printf.h
View file

@ -19,7 +19,7 @@
typedef struct s_fprintf_arg
{
t_usize total_print;
t_file fd;
int fd;
} t_fprintf_arg;
typedef enum e_printf_flags

4
stdme/include/me/types.h
View file

@ -6,7 +6,7 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2023/11/03 14:31:12 by maiboyer #+# #+# */
/* Updated: 2024/05/16 16:12:21 by maiboyer ### ########.fr */
/* Updated: 2024/05/24 14:45:04 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
@ -53,8 +53,6 @@ typedef float t_f32;
/// @brief a 64 bit floating point number
typedef double t_f64;
/// @brief a file descriptor
typedef int t_file;
/// @brief a boolean value that represents an error
/// @note true is an error, false is no error
typedef bool t_error;

2
stdme/src/fs/close.c
View file

@ -14,7 +14,7 @@
#include "me/types.h"
#include <unistd.h>
bool me_close(t_file file, t_i32 *error)
bool me_close(int file, t_i32 *error)
{
t_i32 res;
bool out;

42
stdme/src/fs/fd_array_buffer.c
View file

@ -6,7 +6,7 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/05/19 15:53:50 by maiboyer #+# #+# */
/* Updated: 2024/05/19 17:05:40 by maiboyer ### ########.fr */
/* Updated: 2024/05/24 14:44:45 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
@ -40,7 +40,7 @@ struct s_file_slot *get_unused_fd_slot(void)
return (NULL);
}
void close_all_fds(void)
void close_all_slots(void)
{
t_usize i;
t_fd_array *arr;
@ -48,18 +48,28 @@ void close_all_fds(void)
arr = get_fd_arrays();
i = 0;
while (i < FILE_SLOT_LEN)
{
if (arr->storage[i].ty == SLOT_UNUSED)
;
else if (arr->storage[i].ty == SLOT_FD)
close(arr->storage[i].slot.fd.fd);
else if (arr->storage[i].ty == SLOT_DIR)
closedir(arr->storage[i].slot.dir.ptr);
else if (arr->storage[i].ty == SLOT_FILE)
fclose(arr->storage[i].slot.file.ptr);
else
write(2, "Unknown SLOT type", 17);
mem_set_zero(&arr->storage[i], sizeof(arr->storage[i]));
i++;
}
close_slot(&arr->storage[i++]);
}
void close_slot(struct s_file_slot *slot)
{
if (slot == NULL)
return;
if (slot->ty == SLOT_UNUSED)
;
else if (slot->ty == SLOT_FD)
close(slot->slot.fd.fd);
else if (slot->ty == SLOT_DIR)
closedir(slot->slot.dir.ptr);
else if (slot->ty == SLOT_FILE)
fclose(slot->slot.file.ptr);
else
write(2, "Unknown SLOT type", 17);
mem_set_zero(slot, sizeof(*slot));
}
t_fd *me_open(char *pathname, t_fd_perm permission,
t_file_open_option open_options, t_file_perm fileperm)
{
return (NULL);
}

12
stdme/src/fs/open.c
View file

@ -13,9 +13,9 @@
#include "me/fs/open.h"
#include <fcntl.h>
t_error me_open(t_const_str path, bool read, bool write, t_file *file_out)
t_error me_open(t_const_str path, bool read, bool write, int *file_out)
{
t_file out;
int out;
int flags;
flags = 0;
@ -32,9 +32,9 @@ t_error me_open(t_const_str path, bool read, bool write, t_file *file_out)
return (NO_ERROR);
}
t_error me_open_truncate(t_const_str path, t_file *file_out)
t_error me_open_truncate(t_const_str path, int *file_out)
{
t_file out;
int out;
int flags;
unlink(path);
@ -46,9 +46,9 @@ t_error me_open_truncate(t_const_str path, t_file *file_out)
return (NO_ERROR);
}
t_error me_open_create(t_const_str path, t_file *file_out)
t_error me_open_create(t_const_str path, int *file_out)
{
t_file out;
int out;
int flags;
flags = O_WRONLY | O_CREAT | O_APPEND;

2
stdme/src/fs/putchar_fd.c
View file

@ -14,7 +14,7 @@
#include "me/fs/write.h"
#include "me/str/str.h"
void me_putchar_fd(char chr, t_file file)
void me_putchar_fd(char chr, int file)
{
me_write(file, (t_u8 *)&chr, 1);
}

2
stdme/src/fs/putendl_fd.c
View file

@ -14,7 +14,7 @@
#include "me/fs/write.h"
#include "me/str/str.h"
void me_putendl_fd(t_str str, t_file file)
void me_putendl_fd(t_str str, int file)
{
if (str == NULL)
return ;

2
stdme/src/fs/putnbr_fd.c
View file

@ -34,7 +34,7 @@ static void me_inner(t_u64 nb, t_str out, t_usize *idx)
}
}
void me_putnbr_fd(t_i32 n, t_file file)
void me_putnbr_fd(t_i32 n, int file)
{
t_usize idx;
t_i64 nb;

2
stdme/src/fs/putstr_fd.c
View file

@ -14,7 +14,7 @@
#include "me/fs/write.h"
#include "me/str/str.h"
void me_putstr_fd(t_str str, t_file file)
void me_putstr_fd(t_str str, int file)
{
if (str == NULL)
return ;

2
stdme/src/fs/read.c
View file

@ -13,7 +13,7 @@
#include "me/fs/read.h"
#include <unistd.h>
t_usize me_read(t_file fd, t_u8 *buffer, t_i64 buffer_max, bool *eof_out)
t_usize me_read(int fd, t_u8 *buffer, t_i64 buffer_max, bool *eof_out)
{
ssize_t out;

2
stdme/src/fs/read_to_vec.c
View file

@ -21,7 +21,7 @@ bool read_to_vec(t_const_str path, t_vec_u8 *out)
{
t_u8 temp_buffer[READ_BUFFER_SIZE];
t_isize read_amount;
t_file f;
int f;
bool eof;
t_usize current_size;

2
stdme/src/fs/write.c
View file

@ -13,7 +13,7 @@
#include "me/fs/write.h"
#include <unistd.h>
bool me_write(t_file fd, t_u8 *buffer, t_i64 size)
bool me_write(int fd, t_u8 *buffer, t_i64 size)
{
return (write(fd, buffer, size) < 0);
}

10
stdme/src/gnl/get_next_line.c
View file

@ -20,7 +20,7 @@
#include <stdlib.h>
#include <unistd.h>
static t_static_buffer *get_next_line_buffer(t_file fd)
static t_static_buffer *get_next_line_buffer(int fd)
{
t_usize index;
static t_static_buffer bufs[BUFFER_LENGTH] = {0};
@ -35,7 +35,7 @@ static t_static_buffer *get_next_line_buffer(t_file fd)
return (&bufs[index]);
}
static bool copy_next_line_into_buffer(t_file fd, t_string *out,
static bool copy_next_line_into_buffer(int fd, t_string *out,
char *temp_buffer, t_usize amount)
{
char *buf;
@ -60,7 +60,7 @@ static bool copy_next_line_into_buffer(t_file fd, t_string *out,
return (got_newline);
}
static bool read_and_copy(t_file fd, t_string *out, char *tmp,
static bool read_and_copy(int fd, t_string *out, char *tmp,
t_copy_flags *flags)
{
t_isize amount;
@ -82,7 +82,7 @@ static bool read_and_copy(t_file fd, t_string *out, char *tmp,
return (copy_next_line_into_buffer(fd, out, tmp, (t_usize)amount));
}
static bool handle_leftovers(t_file fd, char *temp_buffer, t_string *buf)
static bool handle_leftovers(int fd, char *temp_buffer, t_string *buf)
{
t_static_buffer *static_buffer;
@ -99,7 +99,7 @@ static bool handle_leftovers(t_file fd, char *temp_buffer, t_string *buf)
return (false);
}
t_string get_next_line(t_file fd, bool *error)
t_string get_next_line(int fd, bool *error)
{
t_string buf;
char *temp_buffer;

2
stdme/src/img/qoi/qoi_fs.c
View file

@ -21,7 +21,7 @@
t_i32 qoi_write(t_const_str filename, const void *data,
const t_qoi_desc *desc)
{
t_file f;
int f;
void *encoded;
t_i32 size;

2
stdme/src/os/pipe.c
View file

@ -14,7 +14,7 @@
t_error create_pipe(t_pipe *out)
{
t_file fds[2];
int fds[2];
if (pipe(fds))
return (ERROR);