42_adjoly/ft_minipowershell
1
0
Fork 0
mirror of https://github.com/KeyZox71/ft_minipowershell.git synced 2025-05-13 16:08:45 +02:00
Code Activity

「🔨」 fix: if folder crash

Browse Source
This commit is contained in:
Adam JOLY
2024-07-14 15:39:28 +02:00
parent 4739d6b6f9
commit fe0285a5b2
17 changed files with 119 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/parsing/check_error/check_argv.c
View File

@ -6,7 +6,7 @@
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/07/03 16:34:19 by adjoly #+# #+# */
/* Updated: 2024/07/03 19:07:23 by adjoly ### ########.fr */
/* Updated: 2024/07/14 15:34:16 by adjoly ### ########.fr */
/* */
/* ************************************************************************** */
@ -14,6 +14,17 @@
#include "parsing.h"
#include "error_msg.h"
bool check_file_name(t_list *redir)
{
while (redir)
{
if (!((t_redirection *)redir->content)->file_name)
return (true);
redir = redir->next;
}
return (false);
}
bool check_argv(t_list *token)
{
t_list *tmp;
@ -23,6 +34,8 @@ bool check_argv(t_list *token)
{
if (!((t_token *)tmp->content)->argv)
return (send_error_parsing(ERROR_NO_CMD));
if (check_file_name(((t_token *)tmp->content)->redirection))
return (send_error_parsing(ERROR_NO_FILE));
tmp = tmp->next;
}
return (false);

23
src/parsing/env_var/env_var_replace.c
View File

@ -6,7 +6,7 @@
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/06/05 21:14:04 by adjoly #+# #+# */
/* Updated: 2024/07/13 18:48:16 by adjoly ### ########.fr */
/* Updated: 2024/07/14 14:50:44 by adjoly ### ########.fr */
/* */
/* ************************************************************************** */
@ -16,11 +16,29 @@
#include "minishell.h"
#include "env.h"
char *__rep_quote(char *dollar)
{
char *tmp;
tmp = dollar;
if (!tmp)
return (NULL);
while (*tmp)
{
if (*tmp == DOUBLE)
*tmp = -2;
else if (*tmp == SINGLE)
*tmp = -1;
tmp++;
}
return (dollar);
}
void __cpy_dollar(char *tmp, size_t dollar_size, t_env *env, char **rl_dlrd)
{
char *dollar;
dollar = env_getn_value(tmp, env, dollar_size - 1);
dollar = __rep_quote(env_getn_value(tmp, env, dollar_size - 2));
if (!dollar)
{
tmp += dollar_size;
@ -28,6 +46,7 @@ void __cpy_dollar(char *tmp, size_t dollar_size, t_env *env, char **rl_dlrd)
}
ft_strlcat(*rl_dlrd, dollar, \
ft_strlen(dollar) + ft_strlen(*rl_dlrd) + 1);
free(dollar);
}
size_t strlen_till_notalnum(char *s)

2
src/parsing/get_redir_fd.c
View File

@ -6,7 +6,7 @@
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/05/30 10:48:41 by adjoly #+# #+# */
/* Updated: 2024/07/13 14:05:27 by adjoly ### ########.fr */
/* Updated: 2024/07/14 15:11:26 by adjoly ### ########.fr */
/* */
/* ************************************************************************** */

2
src/parsing/open_redir.c
View File

@ -6,7 +6,7 @@
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/06/30 15:56:53 by adjoly #+# #+# */
/* Updated: 2024/07/13 13:47:38 by adjoly ### ########.fr */
/* Updated: 2024/07/14 15:19:48 by adjoly ### ########.fr */
/* */
/* ************************************************************************** */

5
src/parsing/tokenizer/__to_redir.c
View File

@ -6,12 +6,13 @@
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/05/25 15:06:15 by adjoly #+# #+# */
/* Updated: 2024/07/10 00:21:08 by adjoly ### ########.fr */
/* Updated: 2024/07/14 15:20:08 by adjoly ### ########.fr */
/* */
/* ************************************************************************** */
#include "tokenizer.h"
#include <stdio.h>
t_redirection *__to_redir(char *redir_s)
{
t_redirection *redir;
@ -27,6 +28,8 @@ t_redirection *__to_redir(char *redir_s)
while (*redir_s && *redir_s == ' ')
redir_s++;
tmp = redir_s;
if (*tmp == '/' || *tmp == '.')
return (redir);
if (!ft_isalnum(*tmp))
return (redir);
while (*tmp && ft_isalnum(*tmp))