raphael/minishell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Called the function to handle single quotes in the export builtin

Browse source
This commit is contained in:
Maix0 2024-08-18 21:52:07 +02:00
parent 7329c95ba0
commit 1d4ff310d0
1 changed files with 20 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

30
exec/src/builtins/export.c
View file

@ -6,7 +6,7 @@
/* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */ /* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/08/07 14:13:41 by rparodi #+# #+# */ /* Created: 2024/08/07 14:13:41 by rparodi #+# #+# */
/* Updated: 2024/08/18 18:06:32 by rparodi ### ########.fr */ /* Updated: 2024/08/18 21:51:31 by maiboyer ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -102,23 +102,21 @@ bool _sort_str(t_str *_lhs, t_str *_rhs)
t_error handle_quotes(t_str raw, t_string *out) t_error handle_quotes(t_str raw, t_string *out)
{ {
t_usize i; t_usize i;
t_string ret; t_string ret;
i = 0; i = 0;
if (!raw) if (!raw)
return (ERROR); return (ERROR);
ret = string_new(16); ret = string_new(16);
string_push_char(&ret, '\'');
while (raw[i] != '\0') while (raw[i] != '\0')
{ {
if (raw[i] == '\'') if (raw[i] == '\'')
string_push(&ret, "'\"'\"'"); printf("Pushing stuff\n"), string_push(&ret, "'\"'\"'");
else else
string_push_char(&ret, raw[i]); string_push_char(&ret, raw[i]);
i++; i++;
} }
string_push_char(&ret, '\'');
return (*out = ret, NO_ERROR); return (*out = ret, NO_ERROR);
} }
@ -127,7 +125,7 @@ t_error _print_export_env(t_state *state, t_builtin_spawn_info info, t_i32 *exit
t_vec_str keys; t_vec_str keys;
t_vec_str keys_uniq; t_vec_str keys_uniq;
t_usize i; t_usize i;
t_str *value; t_str *value;
keys = vec_str_new(16, NULL); keys = vec_str_new(16, NULL);
hmap_env_iter(state->env, _append_key_to_vec, &keys); hmap_env_iter(state->env, _append_key_to_vec, &keys);
@ -152,9 +150,19 @@ t_error _print_export_env(t_state *state, t_builtin_spawn_info info, t_i32 *exit
value = hmap_env_get(state->tmp_var, &keys_uniq.buffer[i]); value = hmap_env_get(state->tmp_var, &keys_uniq.buffer[i]);
if (value == NULL) if (value == NULL)
value = hmap_env_get(state->env, &keys_uniq.buffer[i]); value = hmap_env_get(state->env, &keys_uniq.buffer[i]);
if (*value == NULL) if (value == NULL || *value == NULL)
me_printf_fd(info.stdout, "export %s=''\n", keys_uniq.buffer[i]); {
me_printf_fd(info.stdout, "export %s='%s'\n", keys_uniq.buffer[i], *value); me_printf_fd(info.stdout, "export %s\n", keys_uniq.buffer[i]);
}
else
{
t_string buf;
if (!handle_quotes(*value, &buf))
{
me_printf_fd(info.stdout, "export %s='%s'\n", keys_uniq.buffer[i], buf.buf);
string_free(buf);
}
}
i++; i++;
} }
vec_str_free(keys_uniq); vec_str_free(keys_uniq);