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

Normed the fd function of stdme

Browse source
This commit is contained in:
Raphael (rparodi) 2024-07-30 16:28:35 +02:00
parent e856873de1
commit 3cfbf07882
6 changed files with 378 additions and 300 deletions
Download patch file Download diff file Expand all files Collapse all files

64
stdme/src/fs/directory.c Normal file
View file

@ -0,0 +1,64 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* directory.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/07/30 16:24:53 by rparodi #+# #+# */
/* Updated: 2024/07/30 16:25:23 by rparodi ### ########.fr */
/* */
/* ************************************************************************** */
#include "me/fs/fs.h"
#include "me/mem/mem.h"
#include "me/str/str.h"
#include "me/types.h"
#include "unistd.h"
#include <dirent.h>
#include <errno.h>
#include <stdio.h>
#include <sys/stat.h>
t_error open_dir(t_str name, t_dir **dir)
{
t_dir *out;
struct s_file_slot *slot;
slot = get_unused_fd_slot();
out = &slot->slot.dir;
out->ptr = opendir(name);
if (out->ptr == NULL)
return (ERROR);
slot->ty = SLOT_DIR;
out->name = str_clone(name);
*dir = out;
return (NO_ERROR);
}
t_error read_dir(t_dir *dir, t_dir_entry *out)
{
struct dirent *entry;
if (dir == NULL || out == NULL || dir->ptr == NULL)
return (ERROR);
errno = 0;
entry = readdir(dir->ptr);
if (entry == NULL && errno != 0)
return (ERROR);
*out = entry;
return (NO_ERROR);
}
void close_dir(t_dir *dir)
{
struct s_file_slot *slot;
if (dir == NULL)
return ;
if (closedir(dir->ptr) == -1)
return ;
slot = (void *)(dir)-offsetof(struct s_file_slot, slot.dir);
mem_set_zero(slot, sizeof(*slot));
}

104
stdme/src/fs/fd.c Normal file
View file

@ -0,0 +1,104 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* fd.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/07/30 16:17:17 by rparodi #+# #+# */
/* Updated: 2024/07/30 16:23:47 by rparodi ### ########.fr */
/* */
/* ************************************************************************** */
#include "me/fs/fs.h"
#include "me/mem/mem.h"
#include "me/str/str.h"
#include "me/types.h"
#include "unistd.h"
#include <dirent.h>
#include <errno.h>
#include <stdio.h>
#include <sys/stat.h>
t_fd *open_fd(t_str name, t_fd_perm perms, t_file_open_option open_options,
t_file_perm file_perm)
{
t_fd *fd;
struct s_file_slot *slot;
int actual_perms;
if (perms & FD_READ && perms & FD_WRITE)
actual_perms = O_RDWR;
else if (perms & FD_READ)
actual_perms = O_RDONLY;
else if (perms & FD_WRITE)
actual_perms = O_WRONLY;
else
return (NULL);
actual_perms |= open_options;
slot = get_unused_fd_slot();
fd = &slot->slot.fd;
fd->fd = open(name, actual_perms, file_perm);
if (fd->fd == -1)
return (fd->fd = 0, NULL);
slot->ty = SLOT_FD;
fd->name = str_clone(name);
fd->perms = perms;
fd->type = FD_FILE;
return (fd);
}
t_error read_fd(t_fd *fd, t_u8 *buffer, t_usize size, t_isize *read_count)
{
t_isize ret;
t_isize false_ret;
if (read_count == NULL)
read_count = &false_ret;
if (fd == NULL || buffer == NULL || fd->fd == -1 || \
!(fd->perms & FD_READ))
return (ERROR);
ret = read(fd->fd, buffer, size);
if (ret == -1)
return (ERROR);
*read_count = ret;
return (NO_ERROR);
}
t_error write_fd(t_fd *fd, t_u8 *buffer, t_usize size, t_isize *write_count)
{
t_isize ret;
t_isize fake_ret;
if (write_count == NULL)
write_count = &fake_ret;
if (fd == NULL || buffer == NULL || fd->fd == -1 || !(fd->perms & FD_WRITE))
return (ERROR);
ret = write(fd->fd, buffer, size);
if (ret == -1)
return (ERROR);
*write_count = ret;
return (NO_ERROR);
}
t_error stat_fd(t_fd *fd, t_stat *stat)
{
if (fd == NULL || stat == NULL || fd->fd == -1)
return (ERROR);
if (fstat(fd->fd, stat) == -1)
return (ERROR);
return (NO_ERROR);
}
void close_fd(t_fd *fd)
{
struct s_file_slot *slot;
if (fd == NULL)
return ;
if (close(fd->fd) == -1)
return ;
slot = (void *)(fd)-offsetof(struct s_file_slot, slot.fd);
mem_set_zero(slot, sizeof(*slot));
}

81
stdme/src/fs/file.c Normal file
View file

@ -0,0 +1,81 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* file.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/07/30 16:26:32 by rparodi #+# #+# */
/* Updated: 2024/07/30 16:27:06 by rparodi ### ########.fr */
/* */
/* ************************************************************************** */
#include "me/fs/fs.h"
#include "me/mem/mem.h"
#include "me/str/str.h"
#include "me/types.h"
#include "unistd.h"
#include <dirent.h>
#include <errno.h>
#include <stdio.h>
#include <sys/stat.h>
t_error open_file(t_str name, t_mode mode, t_file **file)
{
t_file *out;
struct s_file_slot *slot;
slot = get_unused_fd_slot();
out = &slot->slot.file;
out->ptr = fopen(name, mode);
if (out->ptr == NULL)
return (ERROR);
slot->ty = SLOT_FILE;
out->name = str_clone(name);
*file = out;
return (NO_ERROR);
}
t_error write_file(t_file *file, t_u8 *buffer, t_usize size,
t_isize *write_count)
{
t_isize ret;
t_isize fake_ret;
if (write_count == NULL)
write_count = &fake_ret;
if (file == NULL || buffer == NULL || file->ptr == NULL)
return (ERROR);
ret = fwrite(buffer, size, 1, file->ptr);
if (ret == -1)
return (ERROR);
*write_count = ret;
return (NO_ERROR);
}
t_error read_file(t_file *file, t_u8 *buffer, t_usize size, t_isize *read_count)
{
t_isize ret;
if (file == NULL || buffer == NULL || read_count == NULL || \
file->ptr == NULL)
return (ERROR);
ret = fread(buffer, size, 1, file->ptr);
if (ret == -1)
return (ERROR);
*read_count = ret;
return (NO_ERROR);
}
void close_file(t_file *file)
{
struct s_file_slot *slot;
if (file == NULL)
return ;
if (fclose(file->ptr) == -1)
return ;
slot = (void *)(file)-offsetof(struct s_file_slot, slot.file);
mem_set_zero(slot, sizeof(*slot));
}

301
stdme/src/fs/fs_internal.c
View file

@ -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/07/30 16:05:20 by rparodi ### ########.fr */ /* Updated: 2024/07/30 16:28:09 by rparodi ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -73,302 +73,3 @@ void close_slot(struct s_file_slot *slot)
(void)!write(2, "Unknown SLOT type", 17); (void)!write(2, "Unknown SLOT type", 17);
mem_set_zero(slot, sizeof(*slot)); mem_set_zero(slot, sizeof(*slot));
} }
/* ______ _____
| ____| __ \
| |__ | | | |
| __| | | | |
| | | |__| |
|_| |_____/
*/
t_fd *open_fd(t_str name, t_fd_perm perms, t_file_open_option open_options,
t_file_perm file_perm)
{
t_fd *fd;
struct s_file_slot *slot;
int actual_perms;
if (perms & FD_READ && perms & FD_WRITE)
actual_perms = O_RDWR;
else if (perms & FD_READ)
actual_perms = O_RDONLY;
else if (perms & FD_WRITE)
actual_perms = O_WRONLY;
else
return (NULL);
actual_perms |= open_options;
slot = get_unused_fd_slot();
fd = &slot->slot.fd;
fd->fd = open(name, actual_perms, file_perm);
if (fd->fd == -1)
return (fd->fd = 0, NULL);
slot->ty = SLOT_FD;
fd->name = str_clone(name);
fd->perms = perms;
fd->type = FD_FILE;
return (fd);
}
t_error read_fd(t_fd *fd, t_u8 *buffer, t_usize size, t_isize *read_count)
{
t_isize ret;
t_isize false_ret;
if (read_count == NULL)
read_count = &false_ret;
if (fd == NULL || buffer == NULL || fd->fd == -1 || \
!(fd->perms & FD_READ))
return (ERROR);
ret = read(fd->fd, buffer, size);
if (ret == -1)
return (ERROR);
*read_count = ret;
return (NO_ERROR);
}
t_error write_fd(t_fd *fd, t_u8 *buffer, t_usize size, t_isize *write_count)
{
t_isize ret;
t_isize fake_ret;
if (write_count == NULL)
write_count = &fake_ret;
if (fd == NULL || buffer == NULL || fd->fd == -1 || !(fd->perms & FD_WRITE))
return (ERROR);
ret = write(fd->fd, buffer, size);
if (ret == -1)
return (ERROR);
*write_count = ret;
return (NO_ERROR);
}
t_error stat_fd(t_fd *fd, t_stat *stat)
{
if (fd == NULL || stat == NULL || fd->fd == -1)
return (ERROR);
if (fstat(fd->fd, stat) == -1)
return (ERROR);
return (NO_ERROR);
}
void close_fd(t_fd *fd)
{
struct s_file_slot *slot;
if (fd == NULL)
return ;
if (close(fd->fd) == -1)
return ;
slot = (void *)(fd)-offsetof(struct s_file_slot, slot.fd);
mem_set_zero(slot, sizeof(*slot));
}
#define INLINE_BUFFER_SIZE 128
void put_number_fd(t_fd *fd, t_u64 number)
{
t_u8 buffer[INLINE_BUFFER_SIZE];
t_usize i;
i = 0;
while (number > 0)
{
buffer[i++] = number % 10 + '0';
number /= 10;
}
while (i > 0)
write_fd(fd, &buffer[--i], 1, NULL);
}
void put_string_fd(t_fd *fd, t_const_str string)
{
write_fd(fd, (t_u8 *)string, str_len(string), NULL);
}
void put_char_fd(t_fd *fd, t_u8 c)
{
write_fd(fd, &c, 1, NULL);
}
/* _____ _____ _____ ______ _____ _______ ____ _______ __
| __ \_ _| __ \| ____/ ____|__ __/ __ \| __ \ \ / /
| | | || | | |__) | |__ | | | | | | | | |__) \ \_/ /
| | | || | | _ /| __|| | | | | | | | _ / \ /
| |__| || |_| | \ \| |___| |____ | | | |__| | | \ \ | |
|_____/_____|_| \_\______\_____| |_| \____/|_| \_\ |_|
*/
t_error open_dir(t_str name, t_dir **dir)
{
t_dir *out;
struct s_file_slot *slot;
slot = get_unused_fd_slot();
out = &slot->slot.dir;
out->ptr = opendir(name);
if (out->ptr == NULL)
return (ERROR);
slot->ty = SLOT_DIR;
out->name = str_clone(name);
*dir = out;
return (NO_ERROR);
}
t_error read_dir(t_dir *dir, t_dir_entry *out)
{
struct dirent *entry;
if (dir == NULL || out == NULL || dir->ptr == NULL)
return (ERROR);
errno = 0;
entry = readdir(dir->ptr);
if (entry == NULL && errno != 0)
return (ERROR);
*out = entry;
return (NO_ERROR);
}
void close_dir(t_dir *dir)
{
struct s_file_slot *slot;
if (dir == NULL)
return ;
if (closedir(dir->ptr) == -1)
return ;
slot = (void *)(dir)-offsetof(struct s_file_slot, slot.dir);
mem_set_zero(slot, sizeof(*slot));
}
/*______ _____ _ ______
| ____|_ _| | | ____|
| |__ | | | | | |__
| __| | | | | | __|
| | _| |_| |____| |____
|_| |_____|______|______|
*/
t_error open_file(t_str name, t_mode mode, t_file **file)
{
t_file *out;
struct s_file_slot *slot;
slot = get_unused_fd_slot();
out = &slot->slot.file;
out->ptr = fopen(name, mode);
if (out->ptr == NULL)
return (ERROR);
slot->ty = SLOT_FILE;
out->name = str_clone(name);
*file = out;
return (NO_ERROR);
}
t_error write_file(t_file *file, t_u8 *buffer, t_usize size,
t_isize *write_count)
{
t_isize ret;
t_isize fake_ret;
if (write_count == NULL)
write_count = &fake_ret;
if (file == NULL || buffer == NULL || file->ptr == NULL)
return (ERROR);
ret = fwrite(buffer, size, 1, file->ptr);
if (ret == -1)
return (ERROR);
*write_count = ret;
return (NO_ERROR);
}
t_error read_file(t_file *file, t_u8 *buffer, t_usize size, t_isize *read_count)
{
t_isize ret;
if (file == NULL || buffer == NULL || read_count == NULL || \
file->ptr == NULL)
return (ERROR);
ret = fread(buffer, size, 1, file->ptr);
if (ret == -1)
return (ERROR);
*read_count = ret;
return (NO_ERROR);
}
void close_file(t_file *file)
{
struct s_file_slot *slot;
if (file == NULL)
return ;
if (fclose(file->ptr) == -1)
return ;
slot = (void *)(file)-offsetof(struct s_file_slot, slot.file);
mem_set_zero(slot, sizeof(*slot));
}
/* _____ ______ _______ _______ ______ _____ _____
/ ____| ____|__ __|__ __| ____| __ \ / ____|
| | __| |__ | | | | | |__ | |__) | (___
| | |_ | __| | | | | | __| | _ / \___ \
| |__| | |____ | | | | | |____| | \ \ ____) |
\_____|______| |_| |_| |______|_| \_\_____/
*/
t_fd *get_stdin(void)
{
t_fd *out;
struct s_file_slot *slot;
static t_fd *value = NULL;
if (value == NULL)
{
slot = get_unused_fd_slot();
out = &slot->slot.fd;
out->fd = STDIN_FILENO;
out->perms = FD_READ;
out->name = str_clone("<stdin>");
slot->ty = SLOT_FD;
value = out;
}
return (value);
}
t_fd *get_stdout(void)
{
t_fd *out;
struct s_file_slot *slot;
static t_fd *value = NULL;
if (value == NULL)
{
slot = get_unused_fd_slot();
out = &slot->slot.fd;
out->fd = STDOUT_FILENO;
out->perms = FD_WRITE;
out->name = str_clone("<stdout>");
slot->ty = SLOT_FD;
value = out;
}
return (value);
}
t_fd *get_stderr(void)
{
t_fd *out;
struct s_file_slot *slot;
static t_fd *value = NULL;
if (value == NULL)
{
slot = get_unused_fd_slot();
out = &slot->slot.fd;
out->fd = STDERR_FILENO;
out->perms = FD_WRITE;
out->name = str_clone("<stderr>");
slot->ty = SLOT_FD;
value = out;
}
return (value);
}

79
stdme/src/fs/getters.c Normal file
View file

@ -0,0 +1,79 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* getters.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/07/30 16:27:28 by rparodi #+# #+# */
/* Updated: 2024/07/30 16:28:03 by rparodi ### ########.fr */
/* */
/* ************************************************************************** */
#include "me/fs/fs.h"
#include "me/mem/mem.h"
#include "me/str/str.h"
#include "me/types.h"
#include "unistd.h"
#include <dirent.h>
#include <errno.h>
#include <stdio.h>
#include <sys/stat.h>
t_fd *get_stdin(void)
{
t_fd *out;
struct s_file_slot *slot;
static t_fd *value = NULL;
if (value == NULL)
{
slot = get_unused_fd_slot();
out = &slot->slot.fd;
out->fd = STDIN_FILENO;
out->perms = FD_READ;
out->name = str_clone("<stdin>");
slot->ty = SLOT_FD;
value = out;
}
return (value);
}
t_fd *get_stdout(void)
{
t_fd *out;
struct s_file_slot *slot;
static t_fd *value = NULL;
if (value == NULL)
{
slot = get_unused_fd_slot();
out = &slot->slot.fd;
out->fd = STDOUT_FILENO;
out->perms = FD_WRITE;
out->name = str_clone("<stdout>");
slot->ty = SLOT_FD;
value = out;
}
return (value);
}
t_fd *get_stderr(void)
{
t_fd *out;
struct s_file_slot *slot;
static t_fd *value = NULL;
if (value == NULL)
{
slot = get_unused_fd_slot();
out = &slot->slot.fd;
out->fd = STDERR_FILENO;
out->perms = FD_WRITE;
out->name = str_clone("<stderr>");
slot->ty = SLOT_FD;
value = out;
}
return (value);
}

49
stdme/src/fs/putfd.c Normal file
View file

@ -0,0 +1,49 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* putfd.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/07/30 16:20:02 by rparodi #+# #+# */
/* Updated: 2024/07/30 16:20:38 by rparodi ### ########.fr */
/* */
/* ************************************************************************** */
#include "me/fs/fs.h"
#include "me/mem/mem.h"
#include "me/str/str.h"
#include "me/types.h"
#include "unistd.h"
#include <dirent.h>
#include <errno.h>
#include <stdio.h>
#include <sys/stat.h>
#define INLINE_BUFFER_SIZE 128
void put_number_fd(t_fd *fd, t_u64 number)
{
t_u8 buffer[INLINE_BUFFER_SIZE];
t_usize i;
i = 0;
while (number > 0)
{
buffer[i++] = number % 10 + '0';
number /= 10;
}
while (i > 0)
write_fd(fd, &buffer[--i], 1, NULL);
}
void put_string_fd(t_fd *fd, t_const_str string)
{
write_fd(fd, (t_u8 *)string, str_len(string), NULL);
}
void put_char_fd(t_fd *fd, t_u8 c)
{
write_fd(fd, &c, 1, NULL);
}