diff options
| author | Charles Cabergs <me@cacharle.xyz> | 2020-09-13 11:34:26 +0200 |
|---|---|---|
| committer | Charles Cabergs <me@cacharle.xyz> | 2020-09-13 14:51:10 +0200 |
| commit | e63d7878ad5d5ad7ceec11e1e8ac79aced93fbc0 (patch) | |
| tree | 1cf021174499677c415eeda12bb9210758a661cf /src/builtin | |
| parent | 7e7219da26b9d256e451f8dddb66641d11f75434 (diff) | |
| download | minishell-e63d7878ad5d5ad7ceec11e1e8ac79aced93fbc0.tar.gz minishell-e63d7878ad5d5ad7ceec11e1e8ac79aced93fbc0.tar.bz2 minishell-e63d7878ad5d5ad7ceec11e1e8ac79aced93fbc0.zip | |
Fixing pipe zombie children
Diffstat (limited to 'src/builtin')
| -rw-r--r-- | src/builtin/export.c | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/src/builtin/export.c b/src/builtin/export.c index d394af6..f19842e 100644 --- a/src/builtin/export.c +++ b/src/builtin/export.c @@ -6,7 +6,7 @@ /* By: charles <charles@student.42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/04/01 17:11:34 by charles #+# #+# */ -/* Updated: 2020/09/12 11:06:47 by charles ### ########.fr */ +/* Updated: 2020/09/13 14:16:28 by charles ### ########.fr */ /* */ /* ************************************************************************** */ @@ -20,20 +20,32 @@ static void st_put_declare_x(char *s) { char *equal_ptr; + int shlvl; if (s == NULL) return ; - ft_putstr("export "); if ((equal_ptr = ft_strchr(s, '=')) == NULL) equal_ptr = ft_strchr(s, '\0'); - write(STDOUT_FILENO, s, equal_ptr - s); + *equal_ptr = '\0'; + if (ft_strcmp(s, "_") == 0) + return ; + ft_putstr("declare -x "); + ft_putstr(s); ft_putchar('='); ft_putchar('"'); - while (*++equal_ptr != '\0') + if (ft_strcmp(s, "SHLVL") == 0) + { + shlvl = ft_atoi(equal_ptr + 1); + ft_putnbr(shlvl + 1); + } + else { - if (*equal_ptr == '"') - ft_putchar('\\'); - ft_putchar(*equal_ptr); + while (*++equal_ptr != '\0') + { + if (*equal_ptr == '"') + ft_putchar('\\'); + ft_putchar(*equal_ptr); + } } ft_putchar('"'); ft_putchar('\n'); |