mirror of
https://github.com/KeyZox71/ft_minipowershell.git
synced 2025-05-13 16:08:45 +02:00
「🏗️」 wip: Started cd and pwd
This commit is contained in:
@ -6,7 +6,7 @@
|
||||
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2024/05/28 18:17:26 by adjoly #+# #+# */
|
||||
/* Updated: 2024/05/30 12:52:51 by adjoly ### ########.fr */
|
||||
/* Updated: 2024/06/24 12:51:27 by adjoly ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
@ -20,7 +20,7 @@ void check_redir(t_list *redir, char **argv)
|
||||
t_redirection *tmp_redir;
|
||||
|
||||
tmp = redir;
|
||||
while(tmp)
|
||||
while (tmp)
|
||||
{
|
||||
tmp_redir = tmp->content;
|
||||
if (tmp_redir->sign == HEREDOC && \
|
||||
|
@ -6,7 +6,7 @@
|
||||
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2024/06/05 21:14:04 by adjoly #+# #+# */
|
||||
/* Updated: 2024/06/20 14:34:25 by adjoly ### ########.fr */
|
||||
/* Updated: 2024/06/24 12:57:59 by adjoly ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
@ -15,6 +15,20 @@
|
||||
#include "parsing.h"
|
||||
#include "env.h"
|
||||
|
||||
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);
|
||||
if (!dollar)
|
||||
{
|
||||
tmp += dollar_size;
|
||||
return ;
|
||||
}
|
||||
ft_strlcat(*rl_dlrd, dollar, \
|
||||
ft_strlen(dollar) + ft_strlen(*rl_dlrd) + 1);
|
||||
}
|
||||
|
||||
size_t strlen_till_notalnum(char *s)
|
||||
{
|
||||
char *tmp;
|
||||
@ -30,8 +44,7 @@ char *env_var_replace(char *readline, t_env *env)
|
||||
char *tmp;
|
||||
char *rl_dollared;
|
||||
size_t dollar_size;
|
||||
char *dollar;
|
||||
|
||||
|
||||
rl_dollared = ft_calloc(get_size_with_env(readline, env) + 1, sizeof(char));
|
||||
if (rl_dollared == NULL)
|
||||
return (NULL);
|
||||
@ -42,13 +55,7 @@ char *env_var_replace(char *readline, t_env *env)
|
||||
{
|
||||
tmp++;
|
||||
dollar_size = strlen_till_notalnum(tmp);
|
||||
dollar = env_getn_value(tmp, env, dollar_size - 1);
|
||||
if (!dollar)
|
||||
{
|
||||
tmp += dollar_size;
|
||||
continue ;
|
||||
}
|
||||
ft_strlcat(rl_dollared, dollar, ft_strlen(dollar) + ft_strlen(rl_dollared) + 1);
|
||||
__cpy_dollar(tmp, dollar_size, env, &rl_dollared);
|
||||
tmp += dollar_size;
|
||||
}
|
||||
else
|
||||
|
@ -6,7 +6,7 @@
|
||||
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2024/06/06 15:01:19 by adjoly #+# #+# */
|
||||
/* Updated: 2024/06/10 17:11:16 by adjoly ### ########.fr */
|
||||
/* Updated: 2024/06/24 12:51:59 by adjoly ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
@ -25,7 +25,8 @@ size_t get_size_with_env(char *readline, t_env *env)
|
||||
size = ft_strlen(readline);
|
||||
while (*tmp)
|
||||
{
|
||||
if (*tmp == '$' && is_inquote(tmp, tmp - readline) != SINGLE && is_inquote(tmp, tmp - readline) != NOT_CLOSED)
|
||||
if (*tmp == '$' && is_inquote(tmp, tmp - readline) != SINGLE && \
|
||||
is_inquote(tmp, tmp - readline) != NOT_CLOSED)
|
||||
{
|
||||
tmp++;
|
||||
size -= strlen_till_char(tmp, ' ');
|
||||
|
@ -6,7 +6,7 @@
|
||||
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2024/05/20 20:06:13 by adjoly #+# #+# */
|
||||
/* Updated: 2024/06/20 17:41:33 by adjoly ### ########.fr */
|
||||
/* Updated: 2024/06/24 12:50:58 by adjoly ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
t_quote __is_quote(char c)
|
||||
{
|
||||
if (c == SINGLE)
|
||||
if (c == SINGLE)
|
||||
return (SINGLE);
|
||||
if (c == DOUBLE)
|
||||
return (DOUBLE);
|
||||
|
Reference in New Issue
Block a user