jack/42-archive
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

conflit

Browse source
This commit is contained in:
gwojda 2017-03-21 14:55:52 +01:00
commit cc4a088f29
11 changed files with 27 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
42sh/Makefile
View file

@ -6,14 +6,14 @@
# By: wescande <wescande@student.42.fr> +#+ +:+ +#+ # # By: wescande <wescande@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2016/08/29 21:32:58 by wescande #+# #+# # # Created: 2016/08/29 21:32:58 by wescande #+# #+# #
# Updated: 2017/03/21 13:38:09 by jhalford ### ########.fr # # Updated: 2017/03/21 14:55:42 by gwojda ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
NAME = 42sh NAME = 42sh
CC = gcc CC = gcc
FLAGS = -Wall -Wextra -Werror -fvisibility=hidden -fsanitize=address FLAGS = -Wall -Wextra -Werror -fvisibility=hidden #-fsanitize=address
D_FLAGS = -g D_FLAGS = -g
DELTA = $$(echo "$$(tput cols)-47"|bc) DELTA = $$(echo "$$(tput cols)-47"|bc)

6
42sh/libft/Makefile
View file

@ -6,7 +6,7 @@
# By: jhalford <jack@crans.org> +#+ +:+ +#+ # # By: jhalford <jack@crans.org> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2017/02/07 16:09:36 by jhalford #+# #+# # # Created: 2017/02/07 16:09:36 by jhalford #+# #+# #
# Updated: 2017/03/20 12:05:06 by wescande ### ########.fr # # Updated: 2017/03/21 12:25:27 by gwojda ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
@ -17,9 +17,9 @@ AR = ar -rc
MKDIR = mkdir -p MKDIR = mkdir -p
RM = /bin/rm -rf RM = /bin/rm -rf
W_FLAGS = -Wall -Wextra -Werror W_FLAGS = -Wall -Wextra -Werror -g
D_FLAGS = -g D_FLAGS = -g
V_FLAGS = -fvisibility=hidden V_FLAGS = #-fvisibility=hidden
FLAGS = $(W_FLAGS) $(D_FLAGS) $(V_FLAGS) FLAGS = $(W_FLAGS) $(D_FLAGS) $(V_FLAGS)
DELTA = $$(echo "$$(tput cols)-47"|bc) DELTA = $$(echo "$$(tput cols)-47"|bc)

4
42sh/libft/src/str/ft_strsub.c
View file

@ -3,10 +3,10 @@
/* ::: :::::::: */ /* ::: :::::::: */
/* ft_strsub.c :+: :+: :+: */ /* ft_strsub.c :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: jhalford <marvin@42.fr> +#+ +:+ +#+ */ /* By: jhalford <jhalford@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2016/11/03 14:58:43 by jhalford #+# #+# */ /* Created: 2016/11/03 14:58:43 by jhalford #+# #+# */
/* Updated: 2016/11/25 11:31:36 by jhalford ### ########.fr */ /* Updated: 2017/03/21 11:38:40 by gwojda ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

3
42sh/src/completion/c_clear.c
View file

@ -6,7 +6,7 @@
/* By: alao <alao@student.42.fr> +#+ +:+ +#+ */ /* By: alao <alao@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/01/10 11:37:43 by alao #+# #+# */ /* Created: 2017/01/10 11:37:43 by alao #+# #+# */
/* Updated: 2017/03/17 16:46:20 by gwojda ### ########.fr */ /* Updated: 2017/03/21 14:02:41 by gwojda ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -65,5 +65,6 @@ int c_clear(t_data *s)
c_clear_lst(ptr); c_clear_lst(ptr);
s->comp ? ft_memdel((void *)&s->comp) : (0); s->comp ? ft_memdel((void *)&s->comp) : (0);
s->comp = NULL; s->comp = NULL;
data_singleton()->comp = NULL;
return (0); return (0);
} }

2
42sh/src/completion/c_find_abspath.c
View file

@ -6,7 +6,7 @@
/* By: gwojda <gwojda@student.42.fr> +#+ +:+ +#+ */ /* By: gwojda <gwojda@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/03/09 16:54:59 by gwojda #+# #+# */ /* Created: 2017/03/09 16:54:59 by gwojda #+# #+# */
/* Updated: 2017/03/19 15:22:06 by gwojda ### ########.fr */ /* Updated: 2017/03/21 14:47:18 by gwojda ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

5
42sh/src/completion/c_find_files.c
View file

@ -6,7 +6,7 @@
/* By: alao <alao@student.42.fr> +#+ +:+ +#+ */ /* By: alao <alao@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/01/09 13:31:21 by alao #+# #+# */ /* Created: 2017/01/09 13:31:21 by alao #+# #+# */
/* Updated: 2017/03/18 09:18:04 by alao ### ########.fr */ /* Updated: 2017/03/21 14:53:21 by gwojda ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -31,7 +31,8 @@ int c_exclusion_folder(t_comp *c)
if ((rep = opendir(tmp)) && (!closedir(rep))) if ((rep = opendir(tmp)) && (!closedir(rep)))
{ {
tmp ? ft_memdel((void *)&tmp) : (0); tmp ? ft_memdel((void *)&tmp) : (0);
if (c->rcmd[ft_strlen(c->rcmd) - 1] == '/') if (c->rcmd[ft_strlen(c->rcmd) - 1] == '/'
|| c->rcmd[ft_strlen(c->rcmd) - 1] == '.')
{ {
c_clear(data_singleton()); c_clear(data_singleton());
return (0); return (0);

4
42sh/src/completion/c_init.c
View file

@ -6,7 +6,7 @@
/* By: alao <alao@student.42.fr> +#+ +:+ +#+ */ /* By: alao <alao@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/01/09 11:21:16 by alao #+# #+# */ /* Created: 2017/01/09 11:21:16 by alao #+# #+# */
/* Updated: 2017/03/17 16:51:46 by gwojda ### ########.fr */ /* Updated: 2017/03/21 11:39:22 by gwojda ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -38,7 +38,7 @@ static char *c_trimmer(char *cmd, int st, int nd)
st = 0; st = 0;
while (rt[st] == ' ') while (rt[st] == ' ')
st++; st++;
tmp = ft_strsub(rt, st, ft_strlen(rt)); tmp = ft_strsub(rt, st, ft_strlen(rt) - st);
if (st) if (st)
data_singleton()->comp->between = ft_strsub(rt, 0, st); data_singleton()->comp->between = ft_strsub(rt, 0, st);
rt ? ft_memdel((void *)&rt) : (0); rt ? ft_memdel((void *)&rt) : (0);

7
42sh/src/completion/c_match_glob.c
View file

@ -6,7 +6,7 @@
/* By: gwojda <gwojda@student.42.fr> +#+ +:+ +#+ */ /* By: gwojda <gwojda@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/03/08 17:20:01 by gwojda #+# #+# */ /* Created: 2017/03/08 17:20:01 by gwojda #+# #+# */
/* Updated: 2017/03/21 10:09:42 by gwojda ### ########.fr */ /* Updated: 2017/03/21 13:40:42 by gwojda ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -78,9 +78,8 @@ static int c_check_glob(char **ss_glob, char *current_word,
str = data_singleton()->line.input; str = data_singleton()->line.input;
free(current_word); free(current_word);
free(glob_echap); free(glob_echap);
if (!*ss_glob || !**ss_glob) if (!*ss_glob || !**ss_glob ||
return (1); !ft_strncmp(str + pos, *ss_glob, ft_strlen(*ss_glob)))
if (!ft_strncmp(str + pos, *ss_glob, ft_strlen(*ss_glob)))
{ {
ft_sstrfree(ss_glob); ft_sstrfree(ss_glob);
return (1); return (1);

9
42sh/src/completion/c_match_update.c
View file

@ -6,7 +6,7 @@
/* By: alao <alao@student.42.fr> +#+ +:+ +#+ */ /* By: alao <alao@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/02/15 12:03:30 by alao #+# #+# */ /* Created: 2017/02/15 12:03:30 by alao #+# #+# */
/* Updated: 2017/03/19 15:28:50 by gwojda ### ########.fr */ /* Updated: 2017/03/21 14:23:01 by gwojda ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -50,17 +50,20 @@ int c_rematch(t_comp *c, long int keypress)
{ {
if (ft_isascii(keypress)) if (ft_isascii(keypress))
{ {
DG("before rematch = \"%s\"", data_singleton()->line.input);
c->isrematch = 1; c->isrematch = 1;
c_term_clear(c); c_term_clear(c);
c_refresh_match(c, keypress); c_refresh_match(c, keypress);
c_clear_lst(c); c_clear_lst(c);
c_matching(data_singleton(), c); c_matching(data_singleton(), c);
if (c->lst == NULL) DG("after matching = \"%s\"", data_singleton()->line.input);
if (data_singleton()->comp && c->lst == NULL)
c_clear(data_singleton()); c_clear(data_singleton());
else if (c->lst == c->lst->next) else if (data_singleton()->comp && c->lst == c->lst->next)
return (1); return (1);
ft_print(keypress, &data_singleton()->line.input, ft_print(keypress, &data_singleton()->line.input,
&data_singleton()->line.pos); &data_singleton()->line.pos);
DG("after rematch = \"%s\"", data_singleton()->line.input);
return (1); return (1);
} }
else else

4
42sh/src/completion/c_output.c
View file

@ -6,7 +6,7 @@
/* By: alao <alao@student.42.fr> +#+ +:+ +#+ */ /* By: alao <alao@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/02/03 13:10:38 by alao #+# #+# */ /* Created: 2017/02/03 13:10:38 by alao #+# #+# */
/* Updated: 2017/03/19 15:18:55 by gwojda ### ########.fr */ /* Updated: 2017/03/21 14:37:14 by gwojda ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -33,7 +33,7 @@ static int c_updater_rcmd(t_comp *c)
ft_memdel((void *)&data_singleton()->line.input); ft_memdel((void *)&data_singleton()->line.input);
data_singleton()->line.input = ft_strdup(c->rcmd); data_singleton()->line.input = ft_strdup(c->rcmd);
} }
new_pos = ft_strlen(c->start) + ft_strlen(c->between) + ft_strlen(c->rcmd); new_pos = ft_strlen(c->rcmd);
data_singleton()->line.pos = new_pos; data_singleton()->line.pos = new_pos;
tmp ? ft_memdel((void *)&tmp) : (0); tmp ? ft_memdel((void *)&tmp) : (0);
tmp2 ? ft_memdel((void *)&tmp2) : (0); tmp2 ? ft_memdel((void *)&tmp2) : (0);

2
42sh/src/completion/c_parser.c
View file

@ -6,7 +6,7 @@
/* By: alao <alao@student.42.fr> +#+ +:+ +#+ */ /* By: alao <alao@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/01/09 13:52:07 by alao #+# #+# */ /* Created: 2017/01/09 13:52:07 by alao #+# #+# */
/* Updated: 2017/03/16 10:29:15 by gwojda ### ########.fr */ /* Updated: 2017/03/21 14:46:39 by gwojda ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */