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

Pre-Merge

Browse source
This commit is contained in:
m600x 2017-02-03 15:08:32 +01:00
parent 9f15e9b4c7
commit fff7a872e6
4 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
42sh/Makefile
View file

@ -6,7 +6,7 @@
# 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/02/03 13:53:09 by alao ### ########.fr # # Updated: 2017/02/03 15:01:26 by alao ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
@ -211,7 +211,7 @@ NB = $(words $(SRC_BASE))
INDEX = 0 INDEX = 0
all : all :
@make -j $(NAME) @make $(NAME)
$(NAME): $(LIBFT_LIB) $(OBJ_DIR) $(OBJS) $(NAME): $(LIBFT_LIB) $(OBJ_DIR) $(OBJS)
@$(CC) $(FLAGS) $(D_FLAGS) \ @$(CC) $(FLAGS) $(D_FLAGS) \

3
42sh/includes/ft_readline.h
View file

@ -6,7 +6,7 @@
/* By: gwojda <gwojda@student.42.fr> +#+ +:+ +#+ */ /* By: gwojda <gwojda@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/01/23 10:35:44 by gwojda #+# #+# */ /* Created: 2017/01/23 10:35:44 by gwojda #+# #+# */
/* Updated: 2017/02/02 18:28:44 by gwojda ### ########.fr */ /* Updated: 2017/02/03 14:34:31 by alao ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -67,6 +67,7 @@ typedef struct s_line
{ {
char *input; char *input;
char *copy_tmp; char *copy_tmp;
char *input_tmp;
size_t pos; size_t pos;
int prompt_size; int prompt_size;
int list_size; int list_size;

6
42sh/src/completion/completion.c
View file

@ -6,7 +6,7 @@
/* By: alao <alao@student.42.fr> +#+ +:+ +#+ */ /* By: alao <alao@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2016/09/20 14:50:33 by alao #+# #+# */ /* Created: 2016/09/20 14:50:33 by alao #+# #+# */
/* Updated: 2017/02/03 14:11:42 by alao ### ########.fr */ /* Updated: 2017/02/03 14:53:57 by alao ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -94,12 +94,14 @@ static int c_dispatcher(t_data *s)
} }
/* /*
** Autocompletion feature. ** Autocompletion feature.
**
** If the structure of the completion (later called comp) doesn't exist, the ** If the structure of the completion (later called comp) doesn't exist, the
** function will check for a few things. If the current position is zero, it ** function will check for a few things. If the current position is zero, it
** will return immediately. Same thing apply if the current position of the ** will return immediately. Same thing apply if the current position of the
** cursor is not a space. If those condition are not met the comp struct is ** cursor is not a space. If those condition are not met the comp struct is
** created using c_init(). ** created using c_init().
**
** If the comp struct already exist at the call of the function, it will check ** If the comp struct already exist at the call of the function, it will check
** which key has been pressed. If the tab key has been used, that mean an other ** which key has been pressed. If the tab key has been used, that mean an other
** item should be selected. This is done using c_next_item(). If the keypress ** item should be selected. This is done using c_next_item(). If the keypress

4
42sh/src/line-editing/get_touch.c
View file

@ -6,7 +6,7 @@
/* By: gwojda <gwojda@student.42.fr> +#+ +:+ +#+ */ /* By: gwojda <gwojda@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/19 16:28:49 by gwojda #+# #+# */ /* Created: 2016/12/19 16:28:49 by gwojda #+# #+# */
/* Updated: 2017/02/03 13:05:41 by alao ### ########.fr */ /* Updated: 2017/02/03 14:54:17 by alao ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -49,6 +49,8 @@ char *ft_read_stdin(void)
if (data_singleton()->line.input[data_singleton()->line.pos]) if (data_singleton()->line.input[data_singleton()->line.pos])
++(data_singleton()->line.pos); ++(data_singleton()->line.pos);
} }
if (data_singleton()->comp)
c_clear(data_singleton());
while (42) while (42)
{ {
ret = 0; ret = 0;