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

Merge branch 'dev' into dev2

Browse Source
This commit is contained in:
tvdu29
2020-01-28 13:42:03 +01:00
committed by GitHub
parent 25c4b28f4c 4a534c8156
commit ce15b661f3
8 changed files with 154 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
srcs/cmd_cd.c
View File

@@ -12,6 +12,24 @@
#include "minishell.h"
void *put_error_cd(char *file, char *msg)
{
ft_putstr("cd: ");
ft_putstr(file);
ft_putstr(": ");
ft_putendl(msg);
return (NULL);
}
int put_error_cd2(char *file, char *msg)
{
ft_putstr("cd: ");
ft_putstr(file);
ft_putstr(": ");
ft_putendl(msg);
return (1);
}
char *check_path_slash_cd(char *exec)
{
int i;
@@ -24,8 +42,9 @@ char *check_path_slash_cd(char *exec)
return (put_error_cd(exec, "no such file or directory"));
if ((i = lstat(exec, &info)) != 0)
return (put_error_cd(exec, "can't determine info"));
if (!S_ISDIR(info.st_mode) || (S_ISLNK(info.st_mode)
&& ((i = stat(exec, &info2)) != 0 || !S_ISDIR(info2.st_mode))))
if ((S_ISLNK(info.st_mode)
&& ((i = stat(exec, &info2)) != 0 || !S_ISDIR(info2.st_mode)))
&& !S_ISDIR(info.st_mode))
return (put_error_cd(exec, "not a directory"));
if ((i = access(exec, X_OK)) != 0)
return (put_error_cd(exec, "permission denied"));
@@ -43,23 +62,16 @@ int cmd_cd_update_env(char *path, t_env **env, char opt)
ft_bzero(p_path, 4096);
if (!(pwd = ft_envgetelem("PWD", *env)))
{
put_error_cd(path, "env var PWD undefined");
return (1);
}
return (put_error_cd2(path, "env var PWD undefined"));
if (getcwd(p_path, 4096) == NULL || (oldpwd = ft_strdup(pwd->val)) == NULL
|| ft_realpath(path, &c_path) == NULL)
{
put_error_cd(path, "error");
return (1);
}
return (put_error_cd2(path, "error"));
if (ft_envupdate("PWD", *env, ((opt == 'P') ? p_path : c_path)) == NULL
|| ft_envupdate("OLDPWD", *env, oldpwd) == NULL)
{
put_error_cd(path, "error");
ft_strdel(&oldpwd);
ft_strdel(&c_path);
return (1);
return (put_error_cd2(path, "error"));
}
ft_strdel(&oldpwd);
ft_strdel(&c_path);
@@ -106,35 +118,42 @@ char cd_getparams(char **argv, size_t *i)
return (ret[0]);
}
int cmd_cd(char **argv, t_env **env)
int cmd_cd_switchboard(char **av, t_env **env, char opt, int i)
{
t_env *elem;
size_t i;
char *path;
char opt;
t_env *e;
char *p;
int ret;
i = 0;
if ((opt = cd_getparams(argv, &i)) == '\0')
return (1);
if (!argv[i] && (elem = ft_envgetelem("HOME", *env)) != NULL && elem->val != NULL)
return (cmd_cd_core(elem->val, env, opt));
else if (argv[i] && argv[i][0] == '/')
return (cmd_cd_core(argv[i], env, opt));
else if (argv[i] && argv[i][0] == '-' && (elem = ft_envgetelem("OLDPWD", *env)) != NULL)
return (cmd_cd_core(elem->val, env, opt));
else if (argv[i] && argv[i][0] != '/' && (elem = ft_envgetelem("PWD", *env)) != NULL && elem->val != NULL)
if ((!av[i] && (e = ft_envgetelem("HOME", *env)) != NULL && e->val
!= NULL) || (av[i] && av[i][0] == '-'
&& (e = ft_envgetelem("OLDPWD", *env)) != NULL))
return (cmd_cd_core(e->val, env, opt));
else if (av[i] && av[i][0] == '/')
return (cmd_cd_core(av[i], env, opt));
else if (av[i] && av[i][0] != '/'
&& (e = ft_envgetelem("PWD", *env)) != NULL && e->val != NULL)
{
if ((path = ft_strnew(ft_strlen(elem->val) + ft_strlen(argv[i]) + 1)) == NULL)
put_error_cd(argv[i], "memory error");
if (path == NULL)
if ((p = ft_strnew(ft_strlen(e->val) + ft_strlen(av[i]) + 1)) == NULL)
put_error_cd(av[i], "memory error");
if (p == NULL)
return (1);
ft_strcpy(path, elem->val);
path[ft_strlen(path)] = '/';
ft_strcat(path, argv[i]);
ret = cmd_cd_core(path, env, opt);
ft_strdel(&path);
ft_strcpy(p, e->val);
p[ft_strlen(p)] = '/';
ft_strcat(p, av[i]);
ret = cmd_cd_core(p, env, opt);
ft_strdel(&p);
return (ret);
}
return (1);
}
int cmd_cd(char **argv, t_env **env)
{
size_t i;
char opt;
i = 0;
if ((opt = cd_getparams(argv, &i)) == '\0')
return (1);
return (cmd_cd_switchboard(argv, env, opt, i));
}