Skip to content

Commit cd2b2f9

Browse files
M1n01M1n01
committed
refactor: マジックナンバーを削除し統一
1 parent 1e626cd commit cd2b2f9

16 files changed

+60
-60
lines changed

‎libft/ft_error.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/* By: minabe <[email protected]> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2022/10/04 13:35:20 by minabe #+# #+# */
9-
/* Updated: 2023/04/30 17:34:57 by minabe ### ########.fr */
9+
/* Updated: 2023/08/03 22:42:04 by minabe ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

@@ -15,6 +15,6 @@
1515
void ft_error(char *str)
1616
{
1717
ft_putendl(str);
18-
exit(1);
18+
exit(EXIT_FAILURE);
1919
return ;
2020
}

‎srcs/builtins/cd.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
/* ::: :::::::: */
44
/* cd.c :+: :+: :+: */
55
/* +:+ +:+ +:+ */
6-
/* By: khorike <khorike@student.42.fr> +#+ +:+ +#+ */
6+
/* By: minabe <minabe@student.42tokyo.jp> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2023/07/12 14:08:10 by khorike #+# #+# */
9-
/* Updated: 2023/07/31 15:00:16 by khorike ### ########.fr */
9+
/* Updated: 2023/08/03 22:43:40 by minabe ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

‎srcs/builtins/create_env_vars.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
/* ::: :::::::: */
44
/* create_env_vars.c :+: :+: :+: */
55
/* +:+ +:+ +:+ */
6-
/* By: khorike <khorike@student.42.fr> +#+ +:+ +#+ */
6+
/* By: minabe <minabe@student.42tokyo.jp> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2023/07/11 17:30:19 by khorike #+# #+# */
9-
/* Updated: 2023/08/02 13:09:39 by khorike ### ########.fr */
9+
/* Updated: 2023/08/03 22:42:47 by minabe ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

@@ -46,11 +46,11 @@ static t_env_var *init_new_var(char *key, char *value, bool is_shell_var)
4646
if (!new_var)
4747
{
4848
perror("Memory allocation failed");
49-
exit(1);
49+
exit(EXIT_FAILURE);
5050
}
5151
new_var->values = ft_split(value, ':');
5252
if (!new_var->values)
53-
exit(1);
53+
exit(EXIT_FAILURE);
5454
new_var->num_values = 0;
5555
p = new_var->values;
5656
while (*p)

‎srcs/builtins/create_env_vars_helper.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
/* ::: :::::::: */
44
/* create_env_vars_helper.c :+: :+: :+: */
55
/* +:+ +:+ +:+ */
6-
/* By: khorike <khorike@student.42.fr> +#+ +:+ +#+ */
6+
/* By: minabe <minabe@student.42tokyo.jp> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2023/08/02 13:08:59 by khorike #+# #+# */
9-
/* Updated: 2023/08/02 13:11:45 by khorike ### ########.fr */
9+
/* Updated: 2023/08/03 22:42:37 by minabe ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

@@ -19,14 +19,14 @@ static void add_env_var(t_env_var **head, char *key,
1919

2020
new_var = (t_env_var *)malloc(sizeof(t_env_var));
2121
if (!new_var)
22-
exit(1);
22+
exit(EXIT_FAILURE);
2323
new_var->key = ft_strdup(key);
2424
new_var->values = (char **)malloc(2 * sizeof(char *));
2525
if (!new_var->key || !new_var->values)
26-
exit(1);
26+
exit(EXIT_FAILURE);
2727
new_var->values[0] = ft_strdup(value);
2828
if (!new_var->values[0])
29-
exit(1);
29+
exit(EXIT_FAILURE);
3030
new_var->values[1] = NULL;
3131
new_var->num_values = 1;
3232
new_var->is_shell_var = is_shell_var;

‎srcs/builtins/export.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
/* ::: :::::::: */
44
/* export.c :+: :+: :+: */
55
/* +:+ +:+ +:+ */
6-
/* By: khorike <khorike@student.42.fr> +#+ +:+ +#+ */
6+
/* By: minabe <minabe@student.42tokyo.jp> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2023/07/11 14:47:53 by khorike #+# #+# */
9-
/* Updated: 2023/08/01 17:01:11 by khorike ### ########.fr */
9+
/* Updated: 2023/08/03 22:43:03 by minabe ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

@@ -62,7 +62,7 @@ static t_env_var *create_new_env_var(char *key, char *value)
6262

6363
new_var = malloc(sizeof(t_env_var));
6464
if (!new_var)
65-
exit(1);
65+
exit(EXIT_FAILURE);
6666
new_var->key = key;
6767
new_var->values = ft_split(value, ':');
6868
new_var->num_values = ft_count_values(new_var->values);
@@ -82,7 +82,7 @@ static int add_env_var_to_list(t_env_var **head, char *env_str)
8282

8383
split_result = ft_split_first(env_str, '=');
8484
if (!split_result)
85-
exit(1);
85+
exit(EXIT_FAILURE);
8686
key = split_result[0];
8787
value = split_result[1];
8888
existing_node = find_node(head, key);

‎srcs/builtins/export_utiles_2.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
/* ::: :::::::: */
44
/* export_utiles_2.c :+: :+: :+: */
55
/* +:+ +:+ +:+ */
6-
/* By: khorike <khorike@student.42.fr> +#+ +:+ +#+ */
6+
/* By: minabe <minabe@student.42tokyo.jp> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2023/07/31 15:11:00 by khorike #+# #+# */
9-
/* Updated: 2023/07/31 15:17:05 by khorike ### ########.fr */
9+
/* Updated: 2023/08/03 22:42:54 by minabe ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

@@ -18,7 +18,7 @@ int type_existing_val(t_env_var *existing_node,
1818
ft_free(existing_node->values);
1919
existing_node->values = ft_split(value, ':');
2020
if (!existing_node->values)
21-
exit(1);
21+
exit(EXIT_FAILURE);
2222
existing_node->num_values = ft_count_values(existing_node->values);
2323
ft_free(value);
2424
ft_free(split_result);

‎srcs/builtins/utiles.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
/* ::: :::::::: */
44
/* utiles.c :+: :+: :+: */
55
/* +:+ +:+ +:+ */
6-
/* By: khorike <khorike@student.42.fr> +#+ +:+ +#+ */
6+
/* By: minabe <minabe@student.42tokyo.jp> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2023/07/12 13:33:45 by khorike #+# #+# */
9-
/* Updated: 2023/08/02 14:48:45 by khorike ### ########.fr */
9+
/* Updated: 2023/08/03 22:43:07 by minabe ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

@@ -23,7 +23,7 @@ int error_failure(char *str, char **str1)
2323
void error_put(char *str)
2424
{
2525
perror(str);
26-
exit(1);
26+
exit(EXIT_FAILURE);
2727
}
2828

2929
int error_str(char *str)

‎srcs/builtins/utility_comand_helper.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
/* ::: :::::::: */
44
/* utility_comand_helper.c :+: :+: :+: */
55
/* +:+ +:+ +:+ */
6-
/* By: khorike <khorike@student.42.fr> +#+ +:+ +#+ */
6+
/* By: minabe <minabe@student.42tokyo.jp> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2023/08/02 15:07:29 by khorike #+# #+# */
9-
/* Updated: 2023/08/02 17:21:01 by khorike ### ########.fr */
9+
/* Updated: 2023/08/03 22:43:10 by minabe ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

@@ -16,7 +16,7 @@ static int execute_in_child_process(char *command_path, char **cmds)
1616
{
1717
execve(command_path, cmds, NULL);
1818
perror("execve failed");
19-
exit(1);
19+
exit(EXIT_FAILURE);
2020
}
2121

2222
static int handle_child_execution(char *command_path, char **cmds)

‎srcs/exec/exec_builtins.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/* By: minabe <[email protected]> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2023/07/13 17:26:36 by khorike #+# #+# */
9-
/* Updated: 2023/08/03 18:15:30 by minabe ### ########.fr */
9+
/* Updated: 2023/08/03 22:43:15 by minabe ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

@@ -21,7 +21,7 @@ static int handle_export(char **cmds, t_env_var **env_vars, int *falgs)
2121
return (declare(*env_vars));
2222
status = ft_export(env_vars, cmds, falgs);
2323
if (status == EXIT_ERROR)
24-
exit(1);
24+
exit(EXIT_FAILURE);
2525
return (status);
2626
}
2727

@@ -62,7 +62,7 @@ static int *init_flags(char **cmds)
6262
i++;
6363
flags = ft_calloc(i, sizeof(int));
6464
if (!flags)
65-
exit(1);
65+
exit(EXIT_FAILURE);
6666
k = 0;
6767
while (cmds[k])
6868
{

‎srcs/exec/exec_from_bin.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/* ************************************************************************** */
22
/* */
33
/* ::: :::::::: */
4-
/* execute_command.c :+: :+: :+: */
4+
/* exec_from_bin.c :+: :+: :+: */
55
/* +:+ +:+ +:+ */
66
/* By: minabe <[email protected]> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2023/08/01 16:41:58 by khorike #+# #+# */
9-
/* Updated: 2023/08/01 19:20:38 by minabe ### ########.fr */
9+
/* Updated: 2023/08/03 22:43:22 by minabe ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

@@ -18,7 +18,7 @@ static void support_fork(char **cmds)
1818
{
1919
execve(cmds[0], cmds, NULL);
2020
perror("execve failed");
21-
exit(1);
21+
exit(EXIT_FAILURE);
2222
}
2323
else
2424
{

‎srcs/exec/expansion.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/* By: minabe <[email protected]> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2023/08/01 15:39:48 by minabe #+# #+# */
9-
/* Updated: 2023/08/01 19:07:45 by minabe ### ########.fr */
9+
/* Updated: 2023/08/03 22:43:19 by minabe ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

@@ -23,7 +23,7 @@ int judgement_desuno(char **cmds, t_directory *dir, t_env_var **env_vars)
2323
{
2424
cmds[j] = expansion(cmds[j], dir, env_vars);
2525
if (!cmds[j])
26-
exit(1);
26+
exit(EXIT_FAILURE);
2727
j++;
2828
}
2929
if (!cmds)

‎srcs/exec/pipe.c

+10-10
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
/* ::: :::::::: */
44
/* pipe.c :+: :+: :+: */
55
/* +:+ +:+ +:+ */
6-
/* By: khorike <khorike@student.42.fr> +#+ +:+ +#+ */
6+
/* By: minabe <minabe@student.42tokyo.jp> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2023/07/18 17:58:34 by khorike #+# #+# */
9-
/* Updated: 2023/08/02 18:02:43 by khorike ### ########.fr */
9+
/* Updated: 2023/08/03 22:46:44 by minabe ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

@@ -17,8 +17,8 @@ static void close_wait(int pipefd[2], pid_t pid1, pid_t pid2, t_directory *dir)
1717
int status1;
1818
int status2;
1919

20-
ft_close(pipefd[0]);
21-
ft_close(pipefd[1]);
20+
ft_close(pipefd[PIPE_READ]);
21+
ft_close(pipefd[PIPE_WRITE]);
2222
ft_waitpid(pid1, &status1, 0);
2323
ft_waitpid(pid2, &status2, 0);
2424
if (WIFEXITED(status1))
@@ -34,9 +34,9 @@ static void close_wait(int pipefd[2], pid_t pid1, pid_t pid2, t_directory *dir)
3434
static void p1(t_node *node, t_directory *dir,
3535
t_env_var **env_vars, int pipefd[2])
3636
{
37-
ft_close(pipefd[0]);
38-
ft_dup2(pipefd[1], STDOUT_FILENO);
39-
ft_close(pipefd[1]);
37+
ft_close(pipefd[PIPE_READ]);
38+
ft_dup2(pipefd[PIPE_WRITE], STDOUT_FILENO);
39+
ft_close(pipefd[PIPE_WRITE]);
4040
if (node->left != NULL)
4141
execution(node->left, dir, env_vars);
4242
exit(dir->error.error_num);
@@ -45,9 +45,9 @@ static void p1(t_node *node, t_directory *dir,
4545
static void p2(t_node *node, t_directory *dir,
4646
t_env_var **env_vars, int pipefd[2])
4747
{
48-
ft_close(pipefd[1]);
49-
ft_dup2(pipefd[0], STDIN_FILENO);
50-
ft_close(pipefd[0]);
48+
ft_close(pipefd[PIPE_WRITE]);
49+
ft_dup2(pipefd[PIPE_READ], STDIN_FILENO);
50+
ft_close(pipefd[PIPE_READ]);
5151
if (node->right != NULL)
5252
execution(node->right, dir, env_vars);
5353
exit(dir->error.error_num);

‎srcs/expansion/expansion.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
/* ::: :::::::: */
44
/* expansion.c :+: :+: :+: */
55
/* +:+ +:+ +:+ */
6-
/* By: khorike <khorike@student.42.fr> +#+ +:+ +#+ */
6+
/* By: minabe <minabe@student.42tokyo.jp> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2023/07/15 15:13:18 by khorike #+# #+# */
9-
/* Updated: 2023/07/31 14:55:16 by khorike ### ########.fr */
9+
/* Updated: 2023/08/03 22:47:34 by minabe ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

@@ -21,7 +21,7 @@ static void temp_result(t_expand *exp, char **result)
2121
ft_free(exp->temp);
2222
if (!result)
2323
{
24-
exit(1);
24+
exit(EXIT_FAILURE);
2525
}
2626
}
2727

@@ -79,13 +79,13 @@ static void handle_no_dollar_sign(t_expand *exp, char **result)
7979

8080
buffer = (char *)malloc(2 * sizeof(char));
8181
if (!buffer)
82-
exit(1);
82+
exit(EXIT_FAILURE);
8383
buffer[0] = *exp->start;
8484
buffer[1] = '\0';
8585
exp->temp = *result;
8686
*result = ft_strjoin(*result, buffer);
8787
if (!result)
88-
exit(1);
88+
exit(EXIT_FAILURE);
8989
ft_free(exp->temp);
9090
ft_free(buffer);
9191
exp->start++;
@@ -99,7 +99,7 @@ char *expand_and_replace(char *input, t_env_var **head)
9999

100100
result = (char *)malloc(MAX_BUFFER_SIZE * sizeof(char));
101101
if (!result)
102-
exit(1);
102+
exit(EXIT_FAILURE);
103103
result[0] = '\0';
104104
exp.start = input;
105105
while (*exp.start != '\0')

‎srcs/expansion/handle_quotation.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
/* ::: :::::::: */
44
/* handle_quotation.c :+: :+: :+: */
55
/* +:+ +:+ +:+ */
6-
/* By: khorike <khorike@student.42.fr> +#+ +:+ +#+ */
6+
/* By: minabe <minabe@student.42tokyo.jp> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2023/07/19 15:09:39 by khorike #+# #+# */
9-
/* Updated: 2023/07/28 12:54:04 by khorike ### ########.fr */
9+
/* Updated: 2023/08/03 22:43:30 by minabe ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

@@ -66,7 +66,7 @@ char *quote_handle(char *str, t_directory *dir, t_env_var **env_vars)
6666

6767
ctx = init_parse_context(str, dir, env_vars);
6868
if (!ctx.result)
69-
exit(1);
69+
exit(EXIT_FAILURE);
7070
state = STATE_NORMAL;
7171
while (ctx.str[ctx.i] != '\0')
7272
{

‎srcs/expansion/helper_handle_dquote.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
/* ::: :::::::: */
44
/* helper_handle_dquote.c :+: :+: :+: */
55
/* +:+ +:+ +:+ */
6-
/* By: khorike <khorike@student.42.fr> +#+ +:+ +#+ */
6+
/* By: minabe <minabe@student.42tokyo.jp> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2023/07/24 19:29:29 by khorike #+# #+# */
9-
/* Updated: 2023/07/27 17:09:26 by khorike ### ########.fr */
9+
/* Updated: 2023/08/03 22:43:37 by minabe ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

@@ -22,10 +22,10 @@ void process_dollar(t_parse_context *ctx)
2222
var_length = get_var_length(ctx->str + ctx->i);
2323
substring = ft_strndup(ctx->str + ctx->i, var_length);
2424
if (!substring)
25-
exit(1);
25+
exit(EXIT_FAILURE);
2626
expanded = dollar_handle(substring, ctx->dir, ctx->env_vars);
2727
if (!expanded)
28-
exit(1);
28+
exit(EXIT_FAILURE);
2929
expanded_length = ft_strlen(expanded);
3030
if (expanded_length < MAX_BUFFER_SIZE - ctx->j)
3131
{

0 commit comments

Comments
 (0)