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

some changes

Browse source
This commit is contained in:
Gregory 2017-04-01 13:52:53 +03:00
parent 1df3194360
commit 0cce1727df
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -65,7 +65,7 @@ FLAGS := $(CC_FLAGS) \
# compiler # compiler
CC = clang CC = gcc
# rules # rules
@ -73,12 +73,12 @@ all: $(NAME)
$(NAME): $(LIBFT_DIR)$(LIBFT) $(OBJ) $(NAME): $(LIBFT_DIR)$(LIBFT) $(OBJ)
@echo "$(CYAN)Linking binary...$(NORMAL)" @echo "$(CYAN)Linking binary...$(NORMAL)"
@$(CC) $(OBJ) $(FLAGS) -o $(NAME) @$(CC) $(OBJ) $(DEBUG) $(FLAGS) -o $(NAME)
@echo "$(GREEN)Done!$(NORMAL)" @echo "$(GREEN)Done!$(NORMAL)"
$(OBJ_DIR)%.o: $(SRC_DIR)%.c $(FT_LS_INC)$(FT_LS_HEADER) $(OBJ_DIR)%.o: $(SRC_DIR)%.c $(FT_LS_INC)$(FT_LS_HEADER)
@echo "$(CYAN)Compiling object files: $(BLUE)$@$(NORMAL)" @echo "$(CYAN)Compiling object files: $(BLUE)$@$(NORMAL)"
@$(CC) $(CC_FLAGS) $(OPT) $(INC) -c $< -o $@ @$(CC) $(CC_FLAGS) $(INC) -c $< -o $@
$(LIBFT_DIR)$(LIBFT): $(LIBFT_DIR)$(LIBFT):
@echo "$(CYAN)Compiling libft library...$(NORMAL)" @echo "$(CYAN)Compiling libft library...$(NORMAL)"

4
src/output.c
View file

@ -73,7 +73,7 @@ void long_format(t_list *lst_d_elm, t_ft_ls *s_ls)
void one_line(t_list *lst_d_elm, t_ft_ls *s_ls) void one_line(t_list *lst_d_elm, t_ft_ls *s_ls)
{ {
ft_putstr(((t_dir_elm *)lst_d_elm->content)->elm_name); ft_putstr(((t_dir_elm *)lst_d_elm->content)->elm_name);
s_ls = 0; s_ls = s_ls;
if (lst_d_elm->next) if (lst_d_elm->next)
ft_putstr(" "); ft_putstr(" ");
else else
@ -82,7 +82,7 @@ void one_line(t_list *lst_d_elm, t_ft_ls *s_ls)
void one_column(t_list *lst_d_elm, t_ft_ls *s_ls) void one_column(t_list *lst_d_elm, t_ft_ls *s_ls)
{ {
s_ls = 0; s_ls = s_ls;
ft_putstr(((t_dir_elm *)lst_d_elm->content)->elm_name); ft_putstr(((t_dir_elm *)lst_d_elm->content)->elm_name);
ft_putstr("\n"); ft_putstr("\n");
} }