Skip to content

Commit 83ef907

Browse files
committed
Merge branch 'dev' into main
2 parents ae2b1b6 + 9065022 commit 83ef907

File tree

13 files changed

+24
-25
lines changed

13 files changed

+24
-25
lines changed

include/error.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
/* ::: :::::::: */
44
/* error.h :+: :+: :+: */
55
/* +:+ +:+ +:+ */
6-
/* By: moseddik <moseddik@student.1337.ma> +#+ +:+ +#+ */
6+
/* By: zaabou <zaabou@student.1337.ma> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2022/07/21 17:05:39 by zaabou #+# #+# */
9-
/* Updated: 2022/08/23 20:30:37 by moseddik ### ########.fr */
9+
/* Updated: 2022/09/14 11:00:39 by zaabou ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

1313
#ifndef ERROR_H
1414
# define ERROR_H
1515

16-
# include "minishell.h"
16+
# include <minishell.h>
1717
# include "syntax_analysis.h"
1818

1919
void ft_print_error(char *str);

lib/libreadline/libhistory.a

45.1 KB
Binary file not shown.

lib/libreadline/libreadline.a

412 KB
Binary file not shown.

src/execution/Helper_functions.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@
66
/* By: zaabou <zaabou@student.1337.ma> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2022/08/03 18:30:55 by zaabou #+# #+# */
9-
/* Updated: 2022/09/10 00:13:53 by zaabou ### ########.fr */
9+
/* Updated: 2022/09/14 11:04:54 by zaabou ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

1313
#include <minishell.h>
14-
#include <errno.h>
1514

1615
char *get_cmd(t_ast *node)
1716
{

src/lexical_analysis/cases_functions.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
/* By: zaabou <zaabou@student.1337.ma> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2022/07/08 11:58:01 by moseddik #+# #+# */
9-
/* Updated: 2022/08/24 10:42:55 by zaabou ### ########.fr */
9+
/* Updated: 2022/09/14 10:58:52 by zaabou ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

13-
#include "../../include/minishell.h"
13+
#include <minishell.h>
1414

1515
char *redir_case(char *str, t_token_list *token_ptr)
1616
{

src/lexical_analysis/linked_list_token.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
/* By: zaabou <zaabou@student.1337.ma> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2022/07/08 11:48:40 by moseddik #+# #+# */
9-
/* Updated: 2022/08/24 10:43:09 by zaabou ### ########.fr */
9+
/* Updated: 2022/09/14 10:59:00 by zaabou ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

13-
#include "../../include/minishell.h"
13+
#include <minishell.h>
1414

1515
t_token_list *ft_lstnew_token(char *content)
1616
{

src/lexical_analysis/tokenizer.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
/* By: zaabou <zaabou@student.1337.ma> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2022/06/24 09:49:00 by moseddik #+# #+# */
9-
/* Updated: 2022/08/24 10:43:14 by zaabou ### ########.fr */
9+
/* Updated: 2022/09/14 10:59:21 by zaabou ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

13-
#include "../../include/minishell.h"
13+
#include <minishell.h>
1414

1515
char *word_case(char *str, t_token_list *token_ptr)
1616
{

src/lexical_analysis/tokenizer_utils.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
/* By: zaabou <zaabou@student.1337.ma> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2022/07/08 11:54:39 by moseddik #+# #+# */
9-
/* Updated: 2022/08/13 10:59:26 by zaabou ### ########.fr */
9+
/* Updated: 2022/09/14 10:59:12 by zaabou ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

13-
#include "../../include/minishell.h"
13+
#include <minishell.h>
1414

1515
char *skip_space(char *str)
1616
{

src/main/main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
/* By: zaabou <zaabou@student.1337.ma> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2022/06/18 10:48:30 by moseddik #+# #+# */
9-
/* Updated: 2022/09/06 11:42:09 by zaabou ### ########.fr */
9+
/* Updated: 2022/09/14 10:59:33 by zaabou ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

13-
#include "../../include/minishell.h"
13+
#include <minishell.h>
1414

1515
void allocate_memory(t_token_list ***head, t_env ***m_env,
1616
char **env, char **pwd)

src/manag_error/ft_print_error.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
/* By: zaabou <zaabou@student.1337.ma> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2022/07/21 17:03:06 by zaabou #+# #+# */
9-
/* Updated: 2022/09/09 23:17:04 by zaabou ### ########.fr */
9+
/* Updated: 2022/09/14 10:58:37 by zaabou ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

13-
#include "../../include/minishell.h"
13+
#include <minishell.h>
1414

1515
void ft_print_error(char *str)
1616
{

src/signals_handler/signals_handler.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
/* ::: :::::::: */
44
/* signals_handler.c :+: :+: :+: */
55
/* +:+ +:+ +:+ */
6-
/* By: moseddik <moseddik@student.1337.ma> +#+ +:+ +#+ */
6+
/* By: zaabou <zaabou@student.1337.ma> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2022/06/30 11:20:52 by moseddik #+# #+# */
9-
/* Updated: 2022/09/14 00:25:46 by moseddik ### ########.fr */
9+
/* Updated: 2022/09/14 10:59:56 by zaabou ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

13-
#include "../../include/minishell.h"
13+
#include <minishell.h>
1414

1515
void handle_ctl_c(int arg)
1616
{

src/syntax_analysis/Helper_functions.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
/* By: zaabou <zaabou@student.1337.ma> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2022/07/28 16:16:45 by moseddik #+# #+# */
9-
/* Updated: 2022/09/10 00:13:41 by zaabou ### ########.fr */
9+
/* Updated: 2022/09/14 11:00:06 by zaabou ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

13-
#include "../../include/minishell.h"
13+
#include <minishell.h>
1414

1515
void add_files(t_lst **head, t_lst *new)
1616
{

src/syntax_analysis/parsing.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
/* ::: :::::::: */
44
/* parsing.c :+: :+: :+: */
55
/* +:+ +:+ +:+ */
6-
/* By: moseddik <moseddik@student.1337.ma> +#+ +:+ +#+ */
6+
/* By: zaabou <zaabou@student.1337.ma> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2022/06/30 12:44:04 by moseddik #+# #+# */
9-
/* Updated: 2022/08/23 15:09:08 by moseddik ### ########.fr */
9+
/* Updated: 2022/09/14 11:00:18 by zaabou ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

13-
#include "../../include/minishell.h"
13+
#include <minishell.h>
1414

1515
t_ast *parse_operator(t_ast *root, t_token_list *token, t_env **m_env)
1616
{

0 commit comments

Comments
 (0)