Kinou/Minishell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add 0 with ret_var

Browse Source
This commit is contained in:
kinou-p 2022-04-14 20:32:29 +02:00
parent 3b8d055260
commit 2d307e55af
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
srcs/set_cmd/set_cmd.c
View File

@ -6,7 +6,7 @@
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */ /* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2022/03/08 15:19:42 by apommier #+# #+# */ /* Created: 2022/03/08 15:19:42 by apommier #+# #+# */
/* Updated: 2022/04/14 10:58:15 by apommier ### ########.fr */ /* Updated: 2022/04/14 12:32:26 by apommier ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -113,6 +113,7 @@ t_cmd *set_cmd(char *input, char **env)
if (cmd) if (cmd)
{ {
cmd->current_s_cmd = cmd->s_cmds[0];//set first s_cmd cmd->current_s_cmd = cmd->s_cmds[0];//set first s_cmd
cmd->err_var = 0;
return (cmd); return (cmd);
} }
return (0); return (0);

15
srcs/set_quote/set_quote.c
View File

@ -6,7 +6,7 @@
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */ /* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2022/04/09 23:58:21 by apommier #+# #+# */ /* Created: 2022/04/09 23:58:21 by apommier #+# #+# */
/* Updated: 2022/04/13 02:19:46 by apommier ### ########.fr */ /* Updated: 2022/04/14 12:31:02 by apommier ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -103,17 +103,20 @@ char *del_char(char *str, int *index)
return (str); return (str);
} }
char *get_var(char **env, char *var_name) char *get_var(t_cmd *cmd, char *var_name)
{ {
char *line; char *line;
char **split_line; char **split_line;
int index; int index;
line = 0; line = 0;
index = find_it(env, var_name); if (!ft_strcmp(var_name, "?"))
return (ft_itoa(cmd->err_var));
printf("var_name -%s-\n", var_name);
index = find_it(cmd->env, var_name);
if (index >= 0) if (index >= 0)
{ {
line = env[index]; line = cmd->env[index];
split_line = ft_split(line, '='); split_line = ft_split(line, '=');
if (split_line[1]) if (split_line[1])
line = ft_strdup(split_line[1]); line = ft_strdup(split_line[1]);
@ -135,11 +138,11 @@ char *change_var(t_cmd *big_cmd, char *cmd, int *index)
char *var; char *var;
i = *index + 1; i = *index + 1;
while (cmd[i] && (ft_isalnum(cmd[i]) || cmd[i] == '_')) while (cmd[i] && (ft_isalnum(cmd[i]) || cmd[i] == '_' || cmd[i] == '?'))
i++; i++;
swap = ft_substr(cmd, *index + 1, i - *index - 1); swap = ft_substr(cmd, *index + 1, i - *index - 1);
//printf("swap= -%s-\n", swap); //printf("swap= -%s-\n", swap);
var = get_var(big_cmd->env, swap); var = get_var(big_cmd, swap);
//printf("var -%s-\n", var); //printf("var -%s-\n", var);
swap2 = ft_strdup(cmd + i); swap2 = ft_strdup(cmd + i);
cmd[*index] = 0; cmd[*index] = 0;