update
This commit is contained in:
parent
6d83a2c196
commit
b1cfc0ee71
31 changed files with 133 additions and 89 deletions
|
|
@ -6,7 +6,7 @@
|
||||||
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
|
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2024/05/14 18:02:12 by maiboyer #+# #+# */
|
/* Created: 2024/05/14 18:02:12 by maiboyer #+# #+# */
|
||||||
/* Updated: 2024/05/23 14:35:35 by maiboyer ### ########.fr */
|
/* Updated: 2024/05/24 13:54:11 by maiboyer ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -24,6 +24,7 @@
|
||||||
readline.dev
|
readline.dev
|
||||||
generic_c.packages.${system}.default
|
generic_c.packages.${system}.default
|
||||||
llvmPackages.bintools
|
llvmPackages.bintools
|
||||||
|
norminette
|
||||||
];
|
];
|
||||||
VALGRIND_INC_OPT = "${pkgs.valgrind.dev}/include";
|
VALGRIND_INC_OPT = "${pkgs.valgrind.dev}/include";
|
||||||
ASAN_OPTIONS = "strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1";
|
ASAN_OPTIONS = "strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1";
|
||||||
|
|
|
||||||
|
|
@ -34,7 +34,7 @@ typedef size_t t_usize;
|
||||||
typedef float t_f32;
|
typedef float t_f32;
|
||||||
typedef double t_f64;
|
typedef double t_f64;
|
||||||
|
|
||||||
typedef int t_file;
|
typedef int int;
|
||||||
|
|
||||||
typedef bool t_error;
|
typedef bool t_error;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@
|
||||||
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
|
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2024/05/02 13:22:14 by maiboyer #+# #+# */
|
/* Created: 2024/05/02 13:22:14 by maiboyer #+# #+# */
|
||||||
/* Updated: 2024/05/09 21:31:42 by maiboyer ### ########.fr */
|
/* Updated: 2024/05/23 17:07:03 by maiboyer ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
|
|
@ -19,36 +19,24 @@
|
||||||
|
|
||||||
void sigint_handle(int sig, siginfo_t *info, void *ucontext)
|
void sigint_handle(int sig, siginfo_t *info, void *ucontext)
|
||||||
{
|
{
|
||||||
static int count = 0;
|
|
||||||
(void)(sig);
|
(void)(sig);
|
||||||
(void)(info);
|
(void)(info);
|
||||||
(void)(ucontext);
|
(void)(ucontext);
|
||||||
count++;
|
|
||||||
printf("\n");
|
printf("\n");
|
||||||
rl_replace_line("", 0);
|
rl_replace_line("", 0);
|
||||||
rl_on_new_line();
|
rl_on_new_line();
|
||||||
rl_redisplay();
|
rl_redisplay();
|
||||||
if (count == 10)
|
|
||||||
{
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void sigquit_handle(int sig, siginfo_t *info, void *ucontext)
|
void sigquit_handle(int sig, siginfo_t *info, void *ucontext)
|
||||||
{
|
{
|
||||||
static int count = 0;
|
|
||||||
(void)(sig);
|
(void)(sig);
|
||||||
(void)(info);
|
(void)(info);
|
||||||
(void)(ucontext);
|
(void)(ucontext);
|
||||||
count++;
|
|
||||||
printf("\n");
|
printf("\n");
|
||||||
rl_replace_line("", 0);
|
rl_replace_line("", 0);
|
||||||
rl_on_new_line();
|
rl_on_new_line();
|
||||||
rl_redisplay();
|
rl_redisplay();
|
||||||
if (count == 10)
|
|
||||||
{
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void sigsegv_handle(int sig, siginfo_t *info, void *ucontext)
|
void sigsegv_handle(int sig, siginfo_t *info, void *ucontext)
|
||||||
|
|
|
||||||
|
|
@ -15,6 +15,6 @@
|
||||||
|
|
||||||
# include "me/types.h"
|
# include "me/types.h"
|
||||||
|
|
||||||
bool me_close(t_file file, t_i32 *error);
|
bool me_close(int file, t_i32 *error);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@
|
||||||
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
|
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2024/05/19 15:12:18 by maiboyer #+# #+# */
|
/* 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 "me/types.h"
|
||||||
#include <dirent.h>
|
#include <dirent.h>
|
||||||
|
#include <fcntl.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <sys/types.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
|
# ifdef FILE_SLOT_LEN
|
||||||
# undef FILE_SLOT_LEN
|
# undef FILE_SLOT_LEN
|
||||||
# endif
|
# endif
|
||||||
|
|
@ -47,9 +48,37 @@ typedef enum e_fd_perm
|
||||||
FD_WRITE = 1 << 1,
|
FD_WRITE = 1 << 1,
|
||||||
} t_fd_perm;
|
} 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
|
typedef struct s_fd
|
||||||
{
|
{
|
||||||
char *name;
|
t_str name;
|
||||||
int fd;
|
int fd;
|
||||||
t_fd_perm perms;
|
t_fd_perm perms;
|
||||||
t_fd_type type;
|
t_fd_type type;
|
||||||
|
|
@ -58,19 +87,19 @@ typedef struct s_fd
|
||||||
typedef struct s_dir
|
typedef struct s_dir
|
||||||
{
|
{
|
||||||
DIR *ptr;
|
DIR *ptr;
|
||||||
char *name;
|
t_str name;
|
||||||
} t_dir;
|
} t_dir;
|
||||||
|
|
||||||
typedef struct s_file_data
|
typedef struct s_file
|
||||||
{
|
{
|
||||||
FILE *ptr;
|
FILE *ptr;
|
||||||
char *name;
|
t_str name;
|
||||||
} t_file_data;
|
} t_file;
|
||||||
|
|
||||||
union u_file_slot {
|
union u_file_slot {
|
||||||
t_fd fd;
|
t_fd fd;
|
||||||
t_dir dir;
|
t_dir dir;
|
||||||
t_file_data file;
|
t_file file;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct s_file_slot
|
struct s_file_slot
|
||||||
|
|
@ -84,8 +113,26 @@ typedef struct s_fd_array
|
||||||
struct s_file_slot storage[FILE_SLOT_LEN];
|
struct s_file_slot storage[FILE_SLOT_LEN];
|
||||||
} t_fd_array;
|
} 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);
|
t_fd_array *get_fd_arrays(void);
|
||||||
struct s_file_slot *get_unused_fd_slot(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 */
|
#endif /* FS_H */
|
||||||
|
|
|
||||||
|
|
@ -15,8 +15,8 @@
|
||||||
|
|
||||||
# include "me/types.h"
|
# include "me/types.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_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_error me_open_create(t_const_str path, t_file *file_out);
|
t_error me_open_create(t_const_str path, int *file_out);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -15,6 +15,6 @@
|
||||||
|
|
||||||
# include "me/types.h"
|
# include "me/types.h"
|
||||||
|
|
||||||
void me_putchar_fd(char chr, t_file file);
|
void me_putchar_fd(char chr, int file);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -15,6 +15,6 @@
|
||||||
|
|
||||||
# include "me/types.h"
|
# include "me/types.h"
|
||||||
|
|
||||||
void me_putendl_fd(t_str str, t_file file);
|
void me_putendl_fd(t_str str, int file);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -15,6 +15,6 @@
|
||||||
|
|
||||||
# include "me/types.h"
|
# include "me/types.h"
|
||||||
|
|
||||||
void me_putnbr_fd(t_i32 n, t_file file);
|
void me_putnbr_fd(t_i32 n, int file);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -15,6 +15,6 @@
|
||||||
|
|
||||||
# include "me/types.h"
|
# include "me/types.h"
|
||||||
|
|
||||||
void me_putstr_fd(t_str str, t_file file);
|
void me_putstr_fd(t_str str, int file);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -15,6 +15,6 @@
|
||||||
|
|
||||||
# include "me/types.h"
|
# 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
|
#endif
|
||||||
|
|
@ -15,6 +15,6 @@
|
||||||
|
|
||||||
# include "me/types.h"
|
# 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
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,7 @@
|
||||||
|
|
||||||
typedef struct s_static_buffer
|
typedef struct s_static_buffer
|
||||||
{
|
{
|
||||||
t_file fd;
|
int fd;
|
||||||
bool used;
|
bool used;
|
||||||
char buf[BUFFER_SIZE + 1];
|
char buf[BUFFER_SIZE + 1];
|
||||||
bool init;
|
bool init;
|
||||||
|
|
@ -38,6 +38,6 @@ typedef struct s_copy_flags
|
||||||
bool empty_read;
|
bool empty_read;
|
||||||
} t_copy_flags;
|
} t_copy_flags;
|
||||||
|
|
||||||
t_string get_next_line(t_file fd, bool *error);
|
t_string get_next_line(int fd, bool *error);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -18,8 +18,8 @@
|
||||||
/// @brief Pipe structure
|
/// @brief Pipe structure
|
||||||
typedef struct s_pipe
|
typedef struct s_pipe
|
||||||
{
|
{
|
||||||
t_file read;
|
int read;
|
||||||
t_file write;
|
int write;
|
||||||
} t_pipe;
|
} t_pipe;
|
||||||
|
|
||||||
/// @brief Create a pipe
|
/// @brief Create a pipe
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,7 @@ union u_redirection
|
||||||
{
|
{
|
||||||
struct s_fd
|
struct s_fd
|
||||||
{
|
{
|
||||||
t_file value;
|
int value;
|
||||||
} fd;
|
} fd;
|
||||||
struct s_piped
|
struct s_piped
|
||||||
{
|
{
|
||||||
|
|
@ -71,7 +71,7 @@ static inline t_redirection inherited(void)
|
||||||
/// @brief Create a file descriptor redirection
|
/// @brief Create a file descriptor redirection
|
||||||
/// @param fd file descriptor to redirect
|
/// @param fd file descriptor to redirect
|
||||||
/// @return the redirection
|
/// @return the redirection
|
||||||
static inline t_redirection fd(t_file fd)
|
static inline t_redirection fd(int fd)
|
||||||
{
|
{
|
||||||
return ((t_redirection){.tag = R_FD, \
|
return ((t_redirection){.tag = R_FD, \
|
||||||
.vals = (union u_redirection){.fd = {.value = fd},}});
|
.vals = (union u_redirection){.fd = {.value = fd},}});
|
||||||
|
|
@ -91,15 +91,15 @@ union u_wrapped_fd
|
||||||
{
|
{
|
||||||
struct s_read_only
|
struct s_read_only
|
||||||
{
|
{
|
||||||
t_file fd;
|
int fd;
|
||||||
} ro;
|
} ro;
|
||||||
struct s_write_only
|
struct s_write_only
|
||||||
{
|
{
|
||||||
t_file fd;
|
int fd;
|
||||||
} wo;
|
} wo;
|
||||||
struct s_read_write
|
struct s_read_write
|
||||||
{
|
{
|
||||||
t_file fd;
|
int fd;
|
||||||
} rw;
|
} rw;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -113,7 +113,7 @@ typedef struct s_wrapped_fd
|
||||||
/// @brief Create a Read only wrapped file descriptor
|
/// @brief Create a Read only wrapped file descriptor
|
||||||
/// @param fd file descriptor to wrap
|
/// @param fd file descriptor to wrap
|
||||||
/// @return the wrapped file descriptor
|
/// @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,
|
return ((t_wrapped_fd){.tag = READ_ONLY,
|
||||||
.vals = (union u_wrapped_fd){
|
.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
|
/// @brief Create a Write only wrapped file descriptor
|
||||||
/// @param fd file descriptor to wrap
|
/// @param fd file descriptor to wrap
|
||||||
/// @return the wrapped file descriptor
|
/// @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,
|
return ((t_wrapped_fd){.tag = WRITE_ONLY,
|
||||||
.vals = (union u_wrapped_fd){.wo = {.fd = fd}}});
|
.vals = (union u_wrapped_fd){.wo = {.fd = fd}}});
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@
|
||||||
typedef struct s_fprintf_arg
|
typedef struct s_fprintf_arg
|
||||||
{
|
{
|
||||||
t_usize total_print;
|
t_usize total_print;
|
||||||
t_file fd;
|
int fd;
|
||||||
} t_fprintf_arg;
|
} t_fprintf_arg;
|
||||||
|
|
||||||
typedef enum e_printf_flags
|
typedef enum e_printf_flags
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@
|
||||||
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
|
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2023/11/03 14:31:12 by maiboyer #+# #+# */
|
/* 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
|
/// @brief a 64 bit floating point number
|
||||||
typedef double t_f64;
|
typedef double t_f64;
|
||||||
|
|
||||||
/// @brief a file descriptor
|
|
||||||
typedef int t_file;
|
|
||||||
/// @brief a boolean value that represents an error
|
/// @brief a boolean value that represents an error
|
||||||
/// @note true is an error, false is no error
|
/// @note true is an error, false is no error
|
||||||
typedef bool t_error;
|
typedef bool t_error;
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@
|
||||||
#include "me/types.h"
|
#include "me/types.h"
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
bool me_close(t_file file, t_i32 *error)
|
bool me_close(int file, t_i32 *error)
|
||||||
{
|
{
|
||||||
t_i32 res;
|
t_i32 res;
|
||||||
bool out;
|
bool out;
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@
|
||||||
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
|
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2024/05/19 15:53:50 by maiboyer #+# #+# */
|
/* 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);
|
return (NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
void close_all_fds(void)
|
void close_all_slots(void)
|
||||||
{
|
{
|
||||||
t_usize i;
|
t_usize i;
|
||||||
t_fd_array *arr;
|
t_fd_array *arr;
|
||||||
|
|
@ -48,18 +48,28 @@ void close_all_fds(void)
|
||||||
arr = get_fd_arrays();
|
arr = get_fd_arrays();
|
||||||
i = 0;
|
i = 0;
|
||||||
while (i < FILE_SLOT_LEN)
|
while (i < FILE_SLOT_LEN)
|
||||||
{
|
close_slot(&arr->storage[i++]);
|
||||||
if (arr->storage[i].ty == SLOT_UNUSED)
|
}
|
||||||
|
|
||||||
|
void close_slot(struct s_file_slot *slot)
|
||||||
|
{
|
||||||
|
if (slot == NULL)
|
||||||
|
return;
|
||||||
|
if (slot->ty == SLOT_UNUSED)
|
||||||
;
|
;
|
||||||
else if (arr->storage[i].ty == SLOT_FD)
|
else if (slot->ty == SLOT_FD)
|
||||||
close(arr->storage[i].slot.fd.fd);
|
close(slot->slot.fd.fd);
|
||||||
else if (arr->storage[i].ty == SLOT_DIR)
|
else if (slot->ty == SLOT_DIR)
|
||||||
closedir(arr->storage[i].slot.dir.ptr);
|
closedir(slot->slot.dir.ptr);
|
||||||
else if (arr->storage[i].ty == SLOT_FILE)
|
else if (slot->ty == SLOT_FILE)
|
||||||
fclose(arr->storage[i].slot.file.ptr);
|
fclose(slot->slot.file.ptr);
|
||||||
else
|
else
|
||||||
write(2, "Unknown SLOT type", 17);
|
write(2, "Unknown SLOT type", 17);
|
||||||
mem_set_zero(&arr->storage[i], sizeof(arr->storage[i]));
|
mem_set_zero(slot, sizeof(*slot));
|
||||||
i++;
|
}
|
||||||
}
|
|
||||||
|
t_fd *me_open(char *pathname, t_fd_perm permission,
|
||||||
|
t_file_open_option open_options, t_file_perm fileperm)
|
||||||
|
{
|
||||||
|
return (NULL);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -13,9 +13,9 @@
|
||||||
#include "me/fs/open.h"
|
#include "me/fs/open.h"
|
||||||
#include <fcntl.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;
|
int flags;
|
||||||
|
|
||||||
flags = 0;
|
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);
|
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;
|
int flags;
|
||||||
|
|
||||||
unlink(path);
|
unlink(path);
|
||||||
|
|
@ -46,9 +46,9 @@ t_error me_open_truncate(t_const_str path, t_file *file_out)
|
||||||
return (NO_ERROR);
|
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;
|
int flags;
|
||||||
|
|
||||||
flags = O_WRONLY | O_CREAT | O_APPEND;
|
flags = O_WRONLY | O_CREAT | O_APPEND;
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@
|
||||||
#include "me/fs/write.h"
|
#include "me/fs/write.h"
|
||||||
#include "me/str/str.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);
|
me_write(file, (t_u8 *)&chr, 1);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@
|
||||||
#include "me/fs/write.h"
|
#include "me/fs/write.h"
|
||||||
#include "me/str/str.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)
|
if (str == NULL)
|
||||||
return ;
|
return ;
|
||||||
|
|
|
||||||
|
|
@ -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_usize idx;
|
||||||
t_i64 nb;
|
t_i64 nb;
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@
|
||||||
#include "me/fs/write.h"
|
#include "me/fs/write.h"
|
||||||
#include "me/str/str.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)
|
if (str == NULL)
|
||||||
return ;
|
return ;
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@
|
||||||
#include "me/fs/read.h"
|
#include "me/fs/read.h"
|
||||||
#include <unistd.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;
|
ssize_t out;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@ bool read_to_vec(t_const_str path, t_vec_u8 *out)
|
||||||
{
|
{
|
||||||
t_u8 temp_buffer[READ_BUFFER_SIZE];
|
t_u8 temp_buffer[READ_BUFFER_SIZE];
|
||||||
t_isize read_amount;
|
t_isize read_amount;
|
||||||
t_file f;
|
int f;
|
||||||
bool eof;
|
bool eof;
|
||||||
t_usize current_size;
|
t_usize current_size;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@
|
||||||
#include "me/fs/write.h"
|
#include "me/fs/write.h"
|
||||||
#include <unistd.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);
|
return (write(fd, buffer, size) < 0);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <unistd.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;
|
t_usize index;
|
||||||
static t_static_buffer bufs[BUFFER_LENGTH] = {0};
|
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]);
|
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 *temp_buffer, t_usize amount)
|
||||||
{
|
{
|
||||||
char *buf;
|
char *buf;
|
||||||
|
|
@ -60,7 +60,7 @@ static bool copy_next_line_into_buffer(t_file fd, t_string *out,
|
||||||
return (got_newline);
|
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_copy_flags *flags)
|
||||||
{
|
{
|
||||||
t_isize amount;
|
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));
|
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;
|
t_static_buffer *static_buffer;
|
||||||
|
|
||||||
|
|
@ -99,7 +99,7 @@ static bool handle_leftovers(t_file fd, char *temp_buffer, t_string *buf)
|
||||||
return (false);
|
return (false);
|
||||||
}
|
}
|
||||||
|
|
||||||
t_string get_next_line(t_file fd, bool *error)
|
t_string get_next_line(int fd, bool *error)
|
||||||
{
|
{
|
||||||
t_string buf;
|
t_string buf;
|
||||||
char *temp_buffer;
|
char *temp_buffer;
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@
|
||||||
t_i32 qoi_write(t_const_str filename, const void *data,
|
t_i32 qoi_write(t_const_str filename, const void *data,
|
||||||
const t_qoi_desc *desc)
|
const t_qoi_desc *desc)
|
||||||
{
|
{
|
||||||
t_file f;
|
int f;
|
||||||
void *encoded;
|
void *encoded;
|
||||||
t_i32 size;
|
t_i32 size;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
t_error create_pipe(t_pipe *out)
|
t_error create_pipe(t_pipe *out)
|
||||||
{
|
{
|
||||||
t_file fds[2];
|
int fds[2];
|
||||||
|
|
||||||
if (pipe(fds))
|
if (pipe(fds))
|
||||||
return (ERROR);
|
return (ERROR);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue