From 75150f95dd2dea4af043ffbebe45210a2227f851 Mon Sep 17 00:00:00 2001 From: mcolonna Date: Wed, 3 Jul 2024 14:10:44 +0200 Subject: [PATCH] norm --- include/variables.h | 6 +++--- src/builtin2.c | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/include/variables.h b/include/variables.h index 1bde87c..0344eac 100644 --- a/include/variables.h +++ b/include/variables.h @@ -6,15 +6,15 @@ /* By: mcolonna +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/06/27 13:43:21 by mcolonna #+# #+# */ -/* Updated: 2024/07/03 11:34:12 by mcolonna ### ########.fr */ +/* Updated: 2024/07/03 14:09:27 by mcolonna ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef VARIABLES_H # define VARIABLES_H -# define SYMBOL_CHARS \ - "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz_0123456789" +# define SYMBOL_CHARS "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz\ +_0123456789" typedef struct s_variable { diff --git a/src/builtin2.c b/src/builtin2.c index 7d6c3c8..2ad64fe 100644 --- a/src/builtin2.c +++ b/src/builtin2.c @@ -6,7 +6,7 @@ /* By: jschaft +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/06/25 13:28:29 by jschaft #+# #+# */ -/* Updated: 2024/07/03 12:16:48 by mcolonna ### ########.fr */ +/* Updated: 2024/07/03 14:06:04 by mcolonna ### ########.fr */ /* */ /* ************************************************************************** */ @@ -75,10 +75,9 @@ int cd_builtin(t_env *env, t_call call, int std[2]) { int r; const char *pwd; - bool go_oldpwd; + const bool go_oldpwd = call.argv[1] && str_eq(call.argv[1], "-"); (void)std; - go_oldpwd = call.argc > 1 && str_eq(call.argv[1], "-"); if (call.argc == 1 || go_oldpwd) pwd = go_home(env, go_oldpwd); else if (call.argc == 2)