tom/minishell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed some permission and outfile issues

Browse Source
This commit is contained in:
mdev9
2024-03-05 15:22:40 +01:00
parent 38fab63d91
commit c1dcf77382
2 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
srcs/exec.c
View File

@ -6,7 +6,7 @@
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */ /* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/02/07 14:12:49 by tomoron #+# #+# */ /* Created: 2024/02/07 14:12:49 by tomoron #+# #+# */
/* Updated: 2024/03/05 12:52:01 by marde-vr ### ########.fr */ /* Updated: 2024/03/05 15:21:11 by marde-vr ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -82,8 +82,7 @@ int get_cmd_count(t_cmd *cmds)
cur_cmd = cmds; cur_cmd = cmds;
while (cur_cmd->next != 0) while (cur_cmd->next != 0)
{ {
if (cur_cmd->type != ARG && (cur_cmd->next if (cur_cmd->type != ARG)
&& cur_cmd->next->type == ARG))
if (cur_cmd->type == PIPE) if (cur_cmd->type == PIPE)
count++; count++;
cur_cmd = cur_cmd->next; cur_cmd = cur_cmd->next;
@ -320,32 +319,32 @@ void remove_command_from_msh(t_msh *msh)
cur_cmd = msh->cmds; cur_cmd = msh->cmds;
while (cur_cmd && cur_cmd->next) while (cur_cmd && cur_cmd->next)
{ {
while (cur_cmd->type != ARG) //while (cur_cmd->type != ARG)
//{
if (cur_cmd->type == PIPE)
{ {
if (cur_cmd->type == PIPE)
{
cmd_tmp = cur_cmd;
cur_cmd = cur_cmd->next;
msh->in_type = cmd_tmp->type;
free(cmd_tmp->token);
free(cmd_tmp);
msh->cmds = cur_cmd;
return ;
}
cmd_tmp = cur_cmd; cmd_tmp = cur_cmd;
cur_cmd = cur_cmd->next; cur_cmd = cur_cmd->next;
msh->in_type = cur_cmd->type; msh->in_type = cmd_tmp->type;
free(cmd_tmp->token); free(cmd_tmp->token);
free(cmd_tmp); free(cmd_tmp);
msh->cmds = cur_cmd; msh->cmds = cur_cmd;
return ;
} }
cmd_tmp = cur_cmd; cmd_tmp = cur_cmd;
cur_cmd = cur_cmd->next; cur_cmd = cur_cmd->next;
msh->in_type = cur_cmd->type;
free(cmd_tmp->token); free(cmd_tmp->token);
free(cmd_tmp); free(cmd_tmp);
msh->cmds = cur_cmd; msh->cmds = cur_cmd;
//}
//cmd_tmp = cur_cmd;
//cur_cmd = cur_cmd->next;
//free(cmd_tmp->token);
//free(cmd_tmp);
//msh->cmds = cur_cmd;
} }
msh->in_type = ARG; msh->in_type = msh->cmds->type;
} }
void get_in_type(t_msh *msh, t_cmd *cmds) void get_in_type(t_msh *msh, t_cmd *cmds)
@ -366,7 +365,7 @@ void get_in_type(t_msh *msh, t_cmd *cmds)
{ {
if (msh->in_fd != 0) if (msh->in_fd != 0)
close(msh->in_fd); close(msh->in_fd);
msh->in_fd = open(cur_cmd->next->token, O_RDONLY); msh->in_fd = open(cur_cmd->next->token, O_RDONLY | O_CREAT);
//ft_printf_fd(2, "opened %s: %d\n", cur_cmd->next->token, msh->in_fd); //ft_printf_fd(2, "opened %s: %d\n", cur_cmd->next->token, msh->in_fd);
if (msh->in_fd == -1 && !g_return_code) if (msh->in_fd == -1 && !g_return_code)
{ {
@ -391,7 +390,13 @@ void get_out_type(t_msh *msh, t_cmd *cmds)
msh->out_type = ARG; msh->out_type = ARG;
msh->out_fd = 0; msh->out_fd = 0;
//ft_printf_fd(2, "%s\n", cmds->token);
cur_cmd = cmds; cur_cmd = cmds;
if (cmds->type && msh->cmds == cmds)
{
while (msh->cmds->type != ARG && msh->cmds->next->next)
msh->cmds = msh->cmds->next->next;
}
while (cur_cmd && cur_cmd->next && (cur_cmd->type == ARG || cur_cmd->type > 3)) while (cur_cmd && cur_cmd->next && (cur_cmd->type == ARG || cur_cmd->type > 3))
cur_cmd = cur_cmd->next; cur_cmd = cur_cmd->next;
if (!cur_cmd->type) if (!cur_cmd->type)
@ -400,7 +405,7 @@ void get_out_type(t_msh *msh, t_cmd *cmds)
{ {
msh->out_type = cur_cmd->type; msh->out_type = cur_cmd->type;
if (msh->out_type == RED_O) if (msh->out_type == RED_O)
msh->out_fd = open(cur_cmd->next->token, O_CREAT | O_RDWR | O_TRUNC, msh->out_fd = open(cur_cmd->next->token, O_CREAT | O_WRONLY | O_TRUNC,
0644); 0644);
if (msh->out_type == RED_O_APP) if (msh->out_type == RED_O_APP)
msh->out_fd = open(cur_cmd->next->token, msh->out_fd = open(cur_cmd->next->token,
@ -409,16 +414,16 @@ void get_out_type(t_msh *msh, t_cmd *cmds)
// ft_printf_fd(2, "opened %s: %d\n", cur_cmd->next->token, msh->out_fd); // ft_printf_fd(2, "opened %s: %d\n", cur_cmd->next->token, msh->out_fd);
if (msh->out_fd == -1) if (msh->out_fd == -1)
{ {
perror("open");
//ft_exit(msh, 1);
g_return_code = 1; g_return_code = 1;
perror("open");
return ; return ;
} }
if (cur_cmd->type != PIPE) if (cur_cmd->type != PIPE)
{ {
cur_cmd = cur_cmd->next; while (cur_cmd->next && cur_cmd->next->type == ARG)
cur_cmd = cur_cmd->next;
if (cur_cmd->next && (cur_cmd->next->type == RED_O || cur_cmd->next->type == RED_O_APP)) if (cur_cmd->next && (cur_cmd->next->type == RED_O || cur_cmd->next->type == RED_O_APP))
get_out_type(msh, cur_cmd->next); get_out_type(msh, cur_cmd);
} }
} }
} }
@ -433,7 +438,6 @@ void exec_command(t_msh *msh)
return ; return ;
cmd_count = get_cmd_count(msh->cmds); cmd_count = get_cmd_count(msh->cmds);
//ft_printf_fd(2, "cmd_count: %d\n", cmd_count); //ft_printf_fd(2, "cmd_count: %d\n", cmd_count);
// todo: fix cmd_count
msh->fds = ft_calloc(cmd_count, sizeof(int **)); msh->fds = ft_calloc(cmd_count, sizeof(int **));
msh->pids = ft_calloc(cmd_count, sizeof(int *)); msh->pids = ft_calloc(cmd_count, sizeof(int *));
if (!msh->pids || !msh->fds) if (!msh->pids || !msh->fds)

2
srcs/main.c
View File

@ -6,7 +6,7 @@
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */ /* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/02/02 21:59:20 by tomoron #+# #+# */ /* Created: 2024/02/02 21:59:20 by tomoron #+# #+# */
/* Updated: 2024/03/05 08:02:22 by marde-vr ### ########.fr */ /* Updated: 2024/03/05 13:20:39 by marde-vr ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */