tvdu29/minishell
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simple norm-out

Browse Source
This commit is contained in:
Tanguy Maze 2019-11-24 11:25:50 +01:00
parent 4123c5dca3
commit 2362474fd6
3 changed files with 79 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.ccls
View File

@ -1,3 +1,4 @@
clang
-Iincludes
-Ilibft/includes
-Ilibft/includes
%c %h -Wall -Wextra -Werror -g-Wall -Wextra -Werror -g

5
srcs/cmd_cd.c
View File

@ -6,7 +6,7 @@
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/01/07 16:44:40 by tmaze #+# #+# */
/* Updated: 2019/11/10 15:51:51 by tmaze ### ########.fr */
/* Updated: 2019/11/11 01:09:36 by tmaze ### ########.fr */
/* */
/* ************************************************************************** */
@ -87,10 +87,7 @@ int cmd_cd_core(char *path, t_env **env, char opt)
t_env *pwd;
if (check_path_slash_cd(path) == NULL)
{
put_error_cd(path, "invalid path");
return (1);
}
if (chdir(path) == -1
|| (pwd = ft_envgetelem("PWD", *env)) == NULL)
{

142
srcs/ms_ext.c
View File

@ -6,100 +6,110 @@
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/10/25 18:21:47 by tmaze #+# #+# */
/* Updated: 2019/11/10 15:55:39 by tmaze ### ########.fr */
/* Updated: 2019/11/18 09:35:44 by tmaze ### ########.fr */
/* */
/* ************************************************************************** */
#include "minishell.h"
void *return_null(char *msg)
{
ft_printf("%s\n", msg);
return (NULL);
}
t_env *search_key(t_env *env, char *cmd, int index)
{
t_env *it;
t_env *ret;
int i;
int j;
it = env;
while (it && cmd[index + 2])
ret = NULL;
while (it && cmd[index + 1])
{
i = 0;
j = index;
while (it->key[i] && cmd[j] && cmd[j] != '}' && it->key[i] == cmd[j])
while (it->key[i] && cmd[j] && it->key[i] == cmd[j])
{
i++;
j++;
}
if (!it->key[i] && cmd[j] == '}')
return (it);
if (!it->key[i] && (!ret || ft_strlen(it->key) > ft_strlen(ret->key)))
{
ft_printf("found key: %s\n", it->key);
ret = it;
}
it = it->next;
}
return (NULL);
return (ret);
}
char **res_ext(char **argv, t_env *env)
char *replace_env(char *src, t_env *elem, int key_size, int i)
{
int i;
int j;
int k;
char *ret;
int res_len;
t_env *elem;
res_len = ft_strlen(src) - key_size + ft_strlen(elem->val);
if ((ret = ft_strnew(res_len)) != NULL)
{
ft_strncpy(ret, src, i);
ft_strcat(ret, elem->val);
ft_strcat(ret, src + 1 + key_size);
}
else
ft_printf("minishell: memory error\n");
return (ret);
}
char *resolve_complete_key(char *src, int *index, t_env *env)
{
t_env *tmp;
char *ret;
if ((tmp = search_key(env, src, *index + 1)) != NULL)
{
if ((ret = replace_env(src, tmp, ft_strlen(tmp->key)
+ 1, *index)) != NULL)
{
ft_strdel(&src);
src = ret;
*index += ft_strlen(tmp->val);
return (src);
}
else
return return_null("minishell: memory error");
}
else
return return_null("minishell: variable not found");
}
char **res_ext(char **av, t_env *env)
{
int i[3];
t_env *tmp;
char *ret;
k = 0;
while (argv && argv[k])
i[0] = 0;
while (av && av[i[0]])
{
i = 0;
while (argv[k] && argv[k][i]) {
if (i == 0 && argv[k][i] == '~' && ft_envgetelem("HOME", env)) {
res_len =
ft_strlen(argv[k]) - 1 + ft_strlen(ft_envgetelem("HOME", env)->val);
if ((ret = ft_strnew(res_len)) != NULL) {
ft_strcpy(ret, ft_envgetelem("HOME", env)->val);
if (ret[ft_strlen(ret) - 1] != '/')
ft_strcat(ret, "/");
ft_strcat(ret, argv[k] + 1);
ft_strdel(&(argv[k]));
argv[k] = ret;
i = ft_strlen(ft_envgetelem("HOME", env)->val);
} else {
ft_printf("minishell: memory error\n");
return (NULL);
}
} else if (argv[k][i] == '$' && argv[k][i + 1] && argv[k][i + 1] == '{') {
j = i + 1;
while (argv[k][j] && argv[k][j] != '}')
j++;
if (!argv[k][j])
{
ft_printf("minishell: missing }\n");
return (NULL);
}
else if ((elem = search_key(env, argv[k], i + 2)) != NULL)
{
if ((ret = ft_strnew(i + ft_strlen(argv[k]) - j +
ft_strlen(elem->val))) != NULL)
{
ft_strncpy(ret, argv[k], i);
ft_strcat(ret, elem->val);
ft_strcat(ret, argv[k] + j + 1);
ft_strdel(&(argv[k]));
argv[k] = ret;
}
else
{
ft_printf("minishell: memory error\n");
return (NULL);
}
}
else
{
ft_printf("minishell: variable %*s not found\n", j - i - 1,
argv[k] + i + 2);
return (NULL);
}
}
i++;
i[2] = 0;
while (av[i[0]] && av[i[0]][i[2]])
{
if (av[i[0]][i[2]] == '~' && (tmp = ft_envgetelem("HOME", env))
!= NULL && (ret = replace_env(av[i[0]], tmp, 1, i[2])) != NULL)
{
ft_strdel(&av[i[0]]);
av[i[0]] = ret;
i[2] += ft_strlen(tmp->val);
}
else if (av[i[0]][i[2]] == '$'
&& resolve_complete_key(av[i[0]], &i[2], env) == NULL)
return (NULL);
i[2]++;
}
k++;
i[0]++;
}
return (argv);
return (av);
}