jack/42-archive
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rectif multi_expand_var

Browse source
This commit is contained in:
wescande 2017-03-24 18:47:03 +01:00
parent 66447bcd9a
commit c4852a0303
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
42sh/includes/glob.h
View file

@ -6,7 +6,7 @@
/* By: wescande <wescande@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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);

10
42sh/src/glob/esc_print.c
View file

@ -6,13 +6,13 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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");
}

6
42sh/src/glob/expand_var.c
View file

@ -6,7 +6,7 @@
/* By: wescande <wescande@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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);