diff --git a/42sh/includes/glob.h b/42sh/includes/glob.h index 77236481..223aff21 100644 --- a/42sh/includes/glob.h +++ b/42sh/includes/glob.h @@ -6,7 +6,7 @@ /* By: wescande +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/01/04 16:31:18 by wescande #+# #+# */ -/* Updated: 2017/03/23 03:18:41 by wescande ### ########.fr */ +/* Updated: 2017/03/24 18:38:35 by wescande ### ########.fr */ /* */ /* ************************************************************************** */ @@ -62,7 +62,7 @@ typedef struct s_bquote */ char **glob(char *str, unsigned char *esc, unsigned char *dbl_esc, int do_match); -void esc_print(char *str, unsigned char *esc); +void esc_print(int fd, char *str, unsigned char *esc); int word_is_assignment(char **content); void *tab_esc_copy(void *content); char *get_output(char *command); diff --git a/42sh/src/glob/esc_print.c b/42sh/src/glob/esc_print.c index a91afb64..c7362f81 100644 --- a/42sh/src/glob/esc_print.c +++ b/42sh/src/glob/esc_print.c @@ -6,13 +6,13 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/02/17 15:38:14 by jhalford #+# #+# */ -/* Updated: 2017/03/15 18:12:49 by jhalford ### ########.fr */ +/* Updated: 2017/03/24 18:39:17 by wescande ### ########.fr */ /* */ /* ************************************************************************** */ #include "minishell.h" -void esc_print(char *str, unsigned char *esc) +void esc_print(int fd, char *str, unsigned char *esc) { char *cur; @@ -20,10 +20,10 @@ void esc_print(char *str, unsigned char *esc) while (*cur) { if (is_char_esc(esc, str, cur)) - ft_printf("\\%c", *cur); + ft_dprintf(fd, "\\%c", *cur); else - ft_printf("%c", *cur); + ft_dprintf(fd, "%c", *cur); ++cur; } - ft_printf("\n"); + ft_dprintf(fd, "\n"); } diff --git a/42sh/src/glob/expand_var.c b/42sh/src/glob/expand_var.c index 1de56e57..2bc248af 100644 --- a/42sh/src/glob/expand_var.c +++ b/42sh/src/glob/expand_var.c @@ -6,7 +6,7 @@ /* By: wescande +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/02/06 16:09:27 by wescande #+# #+# */ -/* Updated: 2017/03/07 12:07:53 by wescande ### ########.fr */ +/* Updated: 2017/03/24 18:42:15 by wescande ### ########.fr */ /* */ /* ************************************************************************** */ @@ -32,12 +32,12 @@ static void insert_var(t_glob *gl, char *pos, char *name, char *content) gl->pat = ft_strjoinf(ft_strjoin(s1, content), s2, 1); new_esc = calc_expand_esc(gl->esc, ft_strlen(s1), (int[2]){ft_strlen(content), 1}, - (int[2]){delta, ft_strlen(s2)}); + (int[2]){delta - 1, ft_strlen(s2)}); ft_memdel((void **)&gl->esc); gl->esc = new_esc; new_esc = calc_expand_esc(gl->esc2, ft_strlen(s1), (int[2]){ft_strlen(content), 1}, - (int[2]){delta, ft_strlen(s2)}); + (int[2]){delta - 1, ft_strlen(s2)}); ft_memdel((void **)&gl->esc2); gl->esc2 = new_esc; ft_strdel(&s1);