diff options
| author | Dominik Kaiser | 2025-01-14 18:20:33 +0100 |
|---|---|---|
| committer | Dominik Kaiser | 2025-01-14 18:20:33 +0100 |
| commit | 3e692dac63577011bd5862a66767ef412183f26b (patch) | |
| tree | c62096c34058d794311ac975c6611aad20f2e1a0 /src/format_string.c | |
| parent | 8c37f835ba29bcecc1d779edb396d97b18667026 (diff) | |
| download | minishell-3e692dac63577011bd5862a66767ef412183f26b.tar.gz minishell-3e692dac63577011bd5862a66767ef412183f26b.zip | |
Some changes
Diffstat (limited to 'src/format_string.c')
| -rw-r--r-- | src/format_string.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/format_string.c b/src/format_string.c index bd7f703..1fe028c 100644 --- a/src/format_string.c +++ b/src/format_string.c @@ -6,7 +6,7 @@ /* By: chuhlig <chuhlig@student.42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/12/17 19:30:11 by chuhlig #+# #+# */ -/* Updated: 2024/12/17 19:31:54 by chuhlig ### ########.fr */ +/* Updated: 2025/01/14 18:06:17 by dkaiser ### ########.fr */ /* */ /* ************************************************************************** */ @@ -17,22 +17,16 @@ static void append_slice(char **dst, char *src, int start, int end); static void append_var(char **dst, char *src, int *pos, t_env *env); -enum e_format_mode -{ - LITERAL = 1, - VARIABLE = 2, -}; - char *format_string(char *str, t_env *env) { char *result; int pos; int start; - int mode; + int is_literal; pos = 0; start = 0; - mode = 0; + is_literal = 0; result = NULL; if (str == NULL) return (NULL); @@ -42,14 +36,14 @@ char *format_string(char *str, t_env *env) { append_slice(&result, str, start, pos); start = pos + 1; - mode ^= LITERAL; + is_literal = !is_literal; } - if (str[pos] == '"' && !(mode & LITERAL)) + if (str[pos] == '"' && !is_literal) { append_slice(&result, str, start, pos); start = pos + 1; } - if (str[pos] == '$' && !(mode & LITERAL)) + if (str[pos] == '$' && !is_literal) { append_slice(&result, str, start, pos); append_var(&result, str, &pos, env); |