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

Merge branch 'master' of github.com:jzck/42sh

Browse source
This commit is contained in:
wescande 2017-03-24 12:42:21 +01:00
commit f0d98b1b2e
5 changed files with 13 additions and 6 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/23 18:17:44 by jhalford ### ########.fr # # Updated: 2017/03/24 12:02:21 by gwojda ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
NAME = 42sh NAME = 42sh
CC = gcc CC = gcc
FLAGS = -Wall -Wextra -Werror -fvisibility=hidden FLAGS = -Wall -Wextra -Werror #-fvisibility=hidden
D_FLAGS = -g D_FLAGS = -g
DELTA = $$(echo "$$(tput cols)-47"|bc) DELTA = $$(echo "$$(tput cols)-47"|bc)

6
42sh/sample/infinite.sh
View file

@ -1 +1,7 @@
echo "echo hello" >> sample/infinite.sh echo "echo hello" >> sample/infinite.sh
echo hello
echo hello
echo hello
echo hello
echo hello
echo hello

4
42sh/src/line_editing/copy_cut_paste/copy_cut_paste.c
View file

@ -6,7 +6,7 @@
/* By: gwojda <gwojda@student.42.fr> +#+ +:+ +#+ */ /* By: gwojda <gwojda@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/19 12:45:06 by gwojda #+# #+# */ /* Created: 2016/12/19 12:45:06 by gwojda #+# #+# */
/* Updated: 2017/03/23 16:52:38 by gwojda ### ########.fr */ /* Updated: 2017/03/24 11:57:45 by gwojda ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -44,7 +44,7 @@ int ft_x(char **str, size_t *pos)
++i; ++i;
if (g_cpy[i].value && (ret = g_cpy[i].f(str, pos, pos_ref))) if (g_cpy[i].value && (ret = g_cpy[i].f(str, pos, pos_ref)))
return (0); return (0);
else else if (!g_cpy[i].value)
break ; break ;
} }
if (data_singleton()->line.copy_tmp && *data_singleton()->line.copy_tmp) if (data_singleton()->line.copy_tmp && *data_singleton()->line.copy_tmp)

2
42sh/src/line_editing/lib_line_editing/toolz2.c
View file

@ -6,7 +6,7 @@
/* By: gwojda <gwojda@student.42.fr> +#+ +:+ +#+ */ /* By: gwojda <gwojda@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/01/07 11:00:28 by gwojda #+# #+# */ /* Created: 2017/01/07 11:00:28 by gwojda #+# #+# */
/* Updated: 2017/03/21 18:10:50 by gwojda ### ########.fr */ /* Updated: 2017/03/24 11:52:10 by gwojda ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

3
42sh/src/line_editing/move_term/move_to_word.c
View file

@ -6,7 +6,7 @@
/* By: gwojda <gwojda@student.42.fr> +#+ +:+ +#+ */ /* By: gwojda <gwojda@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/02/14 11:12:09 by gwojda #+# #+# */ /* Created: 2017/02/14 11:12:09 by gwojda #+# #+# */
/* Updated: 2017/03/17 12:33:43 by gwojda ### ########.fr */ /* Updated: 2017/03/24 12:12:11 by gwojda ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -53,6 +53,7 @@ static void ft_found_prev_word_2(int i, char *str, size_t *pos)
++(*pos); ++(*pos);
} }
(*pos) -= i; (*pos) -= i;
(*pos) -= ((ft_nb_last_line(str, *pos) == 0) ? 1 : 0);
} }
int ft_found_prev_word(char **str, size_t *pos) int ft_found_prev_word(char **str, size_t *pos)