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

debut fixe completion

Browse source
This commit is contained in:
gwojda 2017-03-21 13:55:16 +01:00
parent 930eb5f59a
commit 83ea52445a
8 changed files with 18 additions and 19 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 11:05:18 by gwojda ### ########.fr # # Updated: 2017/03/21 12:25:18 by gwojda ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
NAME = 42sh NAME = 42sh
CC = gcc CC = gcc
FLAGS = -Wall -Wextra -Werror -fvisibility=hidden -fsanitize=address FLAGS = -Wall -Wextra -Werror -g #-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 */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

2
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 12:01:02 by gwojda ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

8
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 13:41:24 by gwojda ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -32,10 +32,10 @@ int c_exclusion_folder(t_comp *c)
{ {
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_clear(data_singleton()); c_clear(data_singleton());*/
return (0); return (0);
} /* }*/
tmp2 = ft_strjoin(c->match, "/"); tmp2 = ft_strjoin(c->match, "/");
c_updater(c, tmp2); c_updater(c, tmp2);
tmp2 ? ft_memdel((void *)&tmp2) : (0); tmp2 ? ft_memdel((void *)&tmp2) : (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);

2
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 12:07:21 by gwojda ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */