From aca0ebba71130b509428e2f56d57b3a8d718bb33 Mon Sep 17 00:00:00 2001 From: Guamss Date: Thu, 30 Apr 2026 14:24:32 +0200 Subject: [PATCH] fix: clean import --- src/disk.c | 7 ------- src/disk.h | 7 ++++++- src/env.c | 2 +- src/exec.c | 11 ++--------- src/exec.h | 7 +++++++ src/parsing.c | 7 ------- src/parsing.h | 6 +++++- src/utils.c | 5 ----- src/utils.h | 6 ++++++ 9 files changed, 27 insertions(+), 31 deletions(-) diff --git a/src/disk.c b/src/disk.c index a8c26a9..06886f3 100644 --- a/src/disk.c +++ b/src/disk.c @@ -1,12 +1,5 @@ /** @file */ #include "disk.h" -#include "env.h" -#include "struct.h" -#include "utils.h" -#include -#include -#include -#include int init_inode_in_disk(disk *d, int inode_index, int filetype, unsigned short perms, int owned_bloc) { diff --git a/src/disk.h b/src/disk.h index 80f89af..2bb1c0d 100644 --- a/src/disk.h +++ b/src/disk.h @@ -2,10 +2,15 @@ #pragma once #include -#include "const.h" #include "struct.h" #include +#include +#include +#include #include "env.h" +#include "const.h" +#include "utils.h" + disk create_disk(); disk open_disk(char* filename); diff --git a/src/env.c b/src/env.c index 9fa13cd..b97b594 100644 --- a/src/env.c +++ b/src/env.c @@ -7,7 +7,7 @@ env *init_envs() { return NULL; envs[0].key = "PWD"; - envs[0].value = "/dir"; + envs[0].value = "/"; envs[1].key = "USER"; envs[1].value = "guams"; diff --git a/src/exec.c b/src/exec.c index b91601c..861fc99 100644 --- a/src/exec.c +++ b/src/exec.c @@ -1,13 +1,6 @@ /** @file */ #include "exec.h" -#include "disk.h" -#include "env.h" -#include "utils.h" -#include "utils.h" -#include -#include -#include -#include + int do_cd(disk *d, char *path) { char full_path[1024] = {0}; @@ -51,7 +44,7 @@ int execute_cmd(disk *d, char **args) { return do_cd(d, args[1]); } - int pid = 0; + int pid = fork(); if (pid == 1) { return -1; diff --git a/src/exec.h b/src/exec.h index ce0503a..8bb3ed1 100644 --- a/src/exec.h +++ b/src/exec.h @@ -1,6 +1,13 @@ /** @file */ #pragma once #include "disk.h" +#include "env.h" +#include "utils.h" +#include "utils.h" +#include +#include +#include +#include "disk.h" #include #include #include diff --git a/src/parsing.c b/src/parsing.c index 6962677..085525c 100644 --- a/src/parsing.c +++ b/src/parsing.c @@ -1,12 +1,5 @@ /** @file */ #include "parsing.h" -#include "const.h" -#include "env.h" -#include "exec.h" -#include -#include -#include -#include /** * @brief Attend que l'utilisateur appuie sur entrée pour récupérer la ligne écrite diff --git a/src/parsing.h b/src/parsing.h index 8b2f140..49aaaa6 100644 --- a/src/parsing.h +++ b/src/parsing.h @@ -1,9 +1,13 @@ /** @file */ #pragma once #include "env.h" +#include "const.h" +#include "env.h" +#include "exec.h" +#include "struct.h" #include #include #include -#include "struct.h" +#include void open_seyshell(disk* disk); \ No newline at end of file diff --git a/src/utils.c b/src/utils.c index e2a5545..a80d3e6 100644 --- a/src/utils.c +++ b/src/utils.c @@ -1,9 +1,4 @@ #include "utils.h" -#include "env.h" -#include -#include -#include -#include void format_path(char *dest, char *src, int dest_len) { if (src == NULL || strcmp(src, "/") == 0 || strlen(src) == 0) { diff --git a/src/utils.h b/src/utils.h index 5544065..2aa98d8 100644 --- a/src/utils.h +++ b/src/utils.h @@ -1,4 +1,10 @@ #pragma once +#include "env.h" +#include +#include +#include +#include + void canonicalize_path(char *path); void format_path(char *dest, char *src, int dest_len); \ No newline at end of file