fotonmoton/ft_ls
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

flags routine change

Browse source
This commit is contained in:
Gregory 2017-03-28 14:34:32 +03:00
parent a4b542088b
commit d07491045d
2 changed files with 28 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
inc/ft_ls.h
View file

@ -31,6 +31,7 @@ typedef struct s_flags
int a; int a;
int R; int R;
int t; int t;
int col;
} t_flags; } t_flags;
typedef struct s_dir_entity typedef struct s_dir_entity

39
src/main.c
View file

@ -32,10 +32,11 @@ int chck_flgs(char *flg, t_flags *flgs)
{ {
if ((!*(flg + 1)) && (flg += 1)) if ((!*(flg + 1)) && (flg += 1))
return (1); return (1);
if (flgs->l == 0) flgs->l = (unsigned int)ft_strchr(flg, 'l'); if (flgs->l == 0) flgs->l = (ft_strchr(flg, 'l') != NULL) ? 1 : 0;
if (flgs->a == 0) flgs->a = (unsigned int)ft_strchr(flg, 'a'); if (flgs->a == 0) flgs->a = (ft_strchr(flg, 'a') != NULL) ? 1 : 0;
if (flgs->R == 0) flgs->R = (unsigned int)ft_strchr(flg, 'R'); if (flgs->R == 0) flgs->R = (ft_strchr(flg, 'R') != NULL) ? 1 : 0;
if (flgs->t == 0) flgs->t = (unsigned int)ft_strchr(flg, 't'); if (flgs->t == 0) flgs->t = (ft_strchr(flg, 't') != NULL) ? 1 : 0;
if (flgs->col == 0) flgs->col = (ft_strchr(flg, '1') != NULL) ? 1 : 0;
return (0); return (0);
} }
@ -53,42 +54,56 @@ void column_out(t_list *entity)
t_dir_entity *d_ent; t_dir_entity *d_ent;
d_ent = (t_dir_entity *)entity->content; d_ent = (t_dir_entity *)entity->content;
if (!d_ent->flags->a) if (d_ent->flags->a)
printf("%s\t", d_ent->dirent->d_name); printf("%s\t", d_ent->dirent->d_name);
else else
if (*d_ent->dirent->d_name != '.') if (*d_ent->dirent->d_name != '.')
printf("%s\t", d_ent->dirent->d_name); printf("%s\t\n", d_ent->dirent->d_name);
}
void output(t_list *del)
{
ft_lstiter(del, column_out);
} }
void ft_ls(char *path, t_flags *flgs) void ft_ls(char *path, t_flags *flgs)
{ {
DIR *dp; DIR *dp;
int blocks; // int blocks;
char *tmp_path; // char *tmp_path;
t_list *dir_ent_list; t_list *dir_ent_list;
tmp_path = 0; // tmp_path = 0;
blocks = 0; // blocks = 0;
dir_ent_list = NULL; dir_ent_list = NULL;
if (!(dp = opendir(path)) || open(path, O_RDONLY) == -1) if (!(dp = opendir(path)) || open(path, O_RDONLY) == -1)
put_error(path); put_error(path);
else else
{ {
init_dir_ent_list(dp, &dir_ent_list, flgs); init_dir_ent_list(dp, &dir_ent_list, flgs);
ft_lstiter(dir_ent_list, column_out); output(dir_ent_list);
} }
} }
void set_flags_to_zero(t_flags *flgs)
{
flgs->a = 0;
flgs->l = 0;
flgs->R = 0;
flgs->t = 0;
flgs->col = 0;
}
void parse_input(int ac, char **av, t_flags *flgs) void parse_input(int ac, char **av, t_flags *flgs)
{ {
int i; int i;
int paths; int paths;
i = 0; i = 0;
set_flags_to_zero(flgs);
if (ac == 1) if (ac == 1)
ft_ls("./", NULL); ft_ls(".", flgs);
else if (ac > 1) else if (ac > 1)
{ {
while (i < ac - 1 && *av[i + 1] == '-') while (i < ac - 1 && *av[i + 1] == '-')